diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-22 14:56:00 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-22 14:56:00 +0000 |
| commit | 07da8651132e2b622977039c170463a57a209a47 (patch) | |
| tree | ec29467b26e93c53b14ebf795336cb13353f0b17 /app/assets/javascripts | |
| parent | 8df6c3b9604ed7b762fd5485275e10f94e698664 (diff) | |
| download | gitlab-ce-label-dropdown-errors.tar.gz | |
Shows error messages when trying to create label in dropdown menulabel-dropdown-errors
Closes #14495
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/api.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/javascripts/api.js.coffee b/app/assets/javascripts/api.js.coffee index 2ddf8612db3..f3ed9a66715 100644 --- a/app/assets/javascripts/api.js.coffee +++ b/app/assets/javascripts/api.js.coffee @@ -74,6 +74,8 @@ dataType: "json" ).done (label) -> callback(label) + .error (message) -> + callback(message.responseJSON) # Return group projects list. Filtered by query groupProjects: (group_id, query, callback) -> diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index 4a0c18a99a6..f3cb1e3bc09 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -14,6 +14,9 @@ class @LabelsSelect defaultLabel = $dropdown.data('default-label') if newLabelField.length + $newLabelError = $dropdown.parent().find('.js-label-error') + $newLabelError.hide() + $('.suggest-colors-dropdown a').on 'click', (e) -> e.preventDefault() e.stopPropagation() @@ -27,6 +30,7 @@ class @LabelsSelect e.stopPropagation() if newLabelField.val() isnt '' and newColorField.val() isnt '' + $newLabelError.hide() $('.js-new-label-btn').disable() # Create new label with API @@ -35,7 +39,13 @@ class @LabelsSelect color: newColorField.val() }, (label) -> $('.js-new-label-btn').enable() - $('.dropdown-menu-back', $dropdown.parent()).trigger 'click' + + if label.message? + $newLabelError + .text label.message + .show() + else + $('.dropdown-menu-back', $dropdown.parent()).trigger 'click' $dropdown.glDropdown( data: (term, callback) -> |