ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Make jobset deletion consistent with project deletion

Browse Source
This commit is contained in:
Eelco Dolstra
2013-02-26 17:36:49 +01:00
parent d596b58991
commit 56a62c3d88
4 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/Hydra/Controller/Jobset.pm
View File

@ -131,6 +131,11 @@ sub submit : Chained('jobset') PathPart Args(0) {
requireProjectOwner($c, $c->stash->{project});
requirePost($c);
if (($c->request->params->{submit} // "") eq "delete") {
$c->stash->{jobset}->delete;
return $c->res->redirect($c->uri_for($c->controller('Project')->action_for("view"), [$c->stash->{project}->name]));
}
txn_do($c->model('DB')->schema, sub {
updateJobset($c, $c->stash->{jobset});
});
@ -140,21 +145,6 @@ sub submit : Chained('jobset') PathPart Args(0) {
}
sub delete : Chained('jobset') PathPart Args(0) {
my ($self, $c) = @_;
requireProjectOwner($c, $c->stash->{project});
requirePost($c);
txn_do($c->model('DB')->schema, sub {
$c->stash->{jobset}->delete;
});
$c->res->redirect($c->uri_for($c->controller('Project')->action_for("view"),
[$c->stash->{project}->name]));
}
sub nixExprPathFromParams {
my ($c) = @_;

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

@ -45,9 +45,9 @@ sub submit : Chained('project') PathPart Args(0) {
requireProjectOwner($c, $c->stash->{project});
requirePost($c);
if (($c->request->params->{submit} || "") eq "delete") {
if (($c->request->params->{submit} // "") eq "delete") {
$c->stash->{project}->delete;
$c->res->redirect($c->uri_for("/"));
return $c->res->redirect($c->uri_for("/"));
}
txn_do($c->model('DB')->schema, sub {