diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-02 13:02:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-02 13:02:41 +0000 |
| commit | cb6af816707571317d8cdaf4a6df20db23512398 (patch) | |
| tree | f4a1def8cebf000372855263aa4609cc7bda0015 | |
| parent | 77c7a0e9eef33f629f13da93257a093710df52d3 (diff) | |
| parent | 722d74c7e91729a33fd23e04ade29b71386cbcf7 (diff) | |
| download | gitlab-ce-cb6af816707571317d8cdaf4a6df20db23512398.tar.gz | |
Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'
Tag deletion doesn't use AJAX anymore
See merge request !2986
| -rw-r--r-- | app/controllers/projects/tags_controller.rb | 7 | ||||
| -rw-r--r-- | app/views/projects/tags/destroy.js.haml | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb index 280fe12cc7c..e580487a2c6 100644 --- a/app/controllers/projects/tags_controller.rb +++ b/app/controllers/projects/tags_controller.rb @@ -34,6 +34,11 @@ class Projects::TagsController < Projects::ApplicationController def destroy DeleteTagService.new(project, current_user).execute(params[:id]) - redirect_to namespace_project_tags_path(@project.namespace, @project) + respond_to do |format| + format.html do + redirect_to namespace_project_tags_path(@project.namespace, @project) + end + format.js + end end end diff --git a/app/views/projects/tags/destroy.js.haml b/app/views/projects/tags/destroy.js.haml new file mode 100644 index 00000000000..ffeacb5a004 --- /dev/null +++ b/app/views/projects/tags/destroy.js.haml @@ -0,0 +1,3 @@ +$('.js-totaltags-count').html("#{@repository.tags.size}"); +- if @repository.tags.empty? + $('.tags').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000) |