| ... | ... |
@@ -22,22 +22,22 @@ |
| 22 | 22 |
$self->redirect_to('/');
|
| 23 | 23 |
return; |
| 24 | 24 |
} |
| 25 |
+ |
|
| 26 |
+ # Parameters |
|
| 27 |
+ my $branch = param('branch');
|
|
| 28 |
+ |
|
| 29 |
+ # Validator |
|
| 30 |
+ my $vc = app->vc; |
|
| 31 |
+ |
|
| 32 |
+ # Validation result |
|
| 33 |
+ my $validation = $vc->validation; |
|
| 34 |
+ |
|
| 35 |
+ # "branch" |
|
| 36 |
+ if (!(defined $branch && length $branch)) {
|
|
| 37 |
+ $validation->add_failed(branch => 'Branch name is empty'); |
|
| 38 |
+ } |
|
| 25 | 39 |
|
| 26 |
- # Validation |
|
| 27 |
- my $params = $api->params; |
|
| 28 |
- my $vc = $self->app->vc; |
|
| 29 |
- my $rule = [ |
|
| 30 |
- branch => [ |
|
| 31 |
- [not_blank => 'Branch name is empty'] |
|
| 32 |
- ] |
|
| 33 |
- ]; |
|
| 34 |
- my $vresult = $vc->validate($params, $rule); |
|
| 35 |
- |
|
| 36 |
- if ($vresult->is_ok) {
|
|
| 37 |
- # Valid parameters |
|
| 38 |
- my $params = $vresult->data; |
|
| 39 |
- my $branch = $params->{branch};
|
|
| 40 |
- |
|
| 40 |
+ if ($validation->is_valid) {
|
|
| 41 | 41 |
# Delete branch |
| 42 | 42 |
eval { $git->delete_branch($user, $project, $branch) };
|
| 43 | 43 |
if (my $e = $@) {
|
| ... | ... |
@@ -50,7 +50,7 @@ |
| 50 | 50 |
return; |
| 51 | 51 |
} |
| 52 | 52 |
} |
| 53 |
- else { $errors = $vresult->messages }
|
|
| 53 |
+ else { $errors = $validation->messages }
|
|
| 54 | 54 |
} |
| 55 | 55 |
|
| 56 | 56 |
# Default branch |