lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity

* Allow `-' in project/jobset names.

Browse source
This commit is contained in:
Eelco Dolstra 2009-03-19 15:12:50 +00:00
parent ba7b94a852
commit af1e60a043
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/Hydra/Controller/Project.pm
View file

@ -100,7 +100,7 @@ sub create_submit : Path('/create-project/submit') {
sub updateProject { sub updateProject {
my ($c, $project) = @_; my ($c, $project) = @_;
my $projectName = trim $c->request->params->{name}; my $projectName = trim $c->request->params->{name};
error($c, "Invalid project name: " . ($projectName || "(empty)")) unless $projectName =~ /^[[:alpha:]]\w*$/; error($c, "Invalid project name: " . ($projectName || "(empty)")) unless $projectName =~ /^[[:alpha:]][\w\-]*$/;
my $displayName = trim $c->request->params->{displayname}; my $displayName = trim $c->request->params->{displayname};
error($c, "Invalid display name: $displayName") if $displayName eq ""; error($c, "Invalid display name: $displayName") if $displayName eq "";
@ -128,7 +128,7 @@ sub updateProject {
next if $baseName eq "template"; next if $baseName eq "template";
my $jobsetName = trim $c->request->params->{"jobset-$baseName-name"}; my $jobsetName = trim $c->request->params->{"jobset-$baseName-name"};
error($c, "Invalid jobset name: $jobsetName") unless $jobsetName =~ /^[[:alpha:]]\w*$/; error($c, "Invalid jobset name: $jobsetName") unless $jobsetName =~ /^[[:alpha:]][\w\-]*$/;
# The Nix expression path must be relative and can't contain ".." elements. # The Nix expression path must be relative and can't contain ".." elements.
my $nixExprPath = trim $c->request->params->{"jobset-$baseName-nixexprpath"}; my $nixExprPath = trim $c->request->params->{"jobset-$baseName-nixexprpath"};