diff options
author | jubianchi <contact@jubianchi.fr> | 2014-08-17 22:22:01 +0200 |
---|---|---|
committer | jubianchi <contact@jubianchi.fr> | 2014-08-20 12:09:19 +0200 |
commit | 7ad93ab250019d7737186a0bf8884faf2db2b625 (patch) | |
tree | cd75991df1a3fe502549dd4f0a1b1d35ba6ddb58 /lib/api/issues.rb | |
parent | ed9e922dd0047435b8d349f0c949ba0a2d789247 (diff) | |
download | gitlab-ce-7ad93ab250019d7737186a0bf8884faf2db2b625.tar.gz |
Improve labels validation and expose error messages
Diffstat (limited to 'lib/api/issues.rb')
-rw-r--r-- | lib/api/issues.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb index 055529ccbd8..eb6a74cd2bc 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -52,8 +52,8 @@ module API attrs = attributes_for_keys [:title, :description, :assignee_id, :milestone_id] # Validate label names in advance - if validate_label_params(params) - return render_api_error!('Label names invalid', 405) + if (errors = validate_label_params(params)).any? + render_api_error!({ labels: errors }, 400) end issue = ::Issues::CreateService.new(user_project, current_user, attrs).execute @@ -90,8 +90,8 @@ module API attrs = attributes_for_keys [:title, :description, :assignee_id, :milestone_id, :state_event] # Validate label names in advance - if validate_label_params(params) - return render_api_error!('Label names invalid', 405) + if (errors = validate_label_params(params)).any? + render_api_error!({ labels: errors }, 400) end issue = ::Issues::UpdateService.new(user_project, current_user, attrs).execute(issue) @@ -99,7 +99,8 @@ module API if issue.valid? # Find or create labels and attach to issue. Labels are valid because # we already checked its name, so there can't be an error here - if params[:labels].present? + unless params[:labels].nil? + issue.remove_labels # Create and add labels to the new created issue issue.add_labels_by_names(params[:labels].split(',')) end |