diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-13 18:28:52 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-13 18:28:52 +0000 |
| commit | fdd8e4507527badd875a40a0ab8a3ed47a03c764 (patch) | |
| tree | 3973a0e55033e32ea022fbe7911212501f9235da | |
| parent | 1d63464c82db58763a0941c22ab8c3c973890a38 (diff) | |
| parent | 540596b7b5bf0e107fafbc6041d9318125c3cef8 (diff) | |
| download | gitlab-ce-fdd8e4507527badd875a40a0ab8a3ed47a03c764.tar.gz | |
Merge branch 'remove-remove-label' into 'master'
Remove labels via ajax
See merge request !1019
| -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?"} |