Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-13 20:47:03 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-13 20:47:03 +0400
commit540596b7b5bf0e107fafbc6041d9318125c3cef8 (patch)
treed310c2893b37d459e2f0771393fc6169f58d78f4 /app
parentd8b769ec740f9e6d47c3885d99796e4ca9337cbc (diff)
Remove labels with ajax request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/labels_controller.rb5
-rw-r--r--app/views/projects/labels/_label.html.haml2
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?"}