diff options
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/projects/labels/_label.html.haml | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index d049012f6d8..87d1c942034 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -50,7 +50,10 @@ class Projects::LabelsController < Projects::ApplicationController def destroy @label.destroy - redirect_to project_labels_path(@project), notice: 'Label was removed' + respond_to do |format| + format.html { redirect_to project_labels_path(@project), notice: 'Label was removed' } + format.js { render nothing: true } + end end protected diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml index 725bf852078..03a8f0921b7 100644 --- a/app/views/projects/labels/_label.html.haml +++ b/app/views/projects/labels/_label.html.haml @@ -7,4 +7,4 @@ - if can? current_user, :admin_label, @project = link_to 'Edit', edit_project_label_path(@project, label), class: 'btn' - = link_to 'Remove', project_label_path(@project, label), class: 'btn btn-remove', method: :delete, data: {confirm: "Remove this label? Are you sure?"} + = link_to 'Remove', project_label_path(@project, label), class: 'btn btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?"} |