Download as
Browse Code »

Commit 8aad796b15f001e0de5d51d50975ef0b231343a3

Authored by Antonio Terceiro
1 parent 252ec20a
Exists in master and in 8 other branches cherry-pick-62193d8b, federation, gemfile-changes, rails4, rails5, stable-1.2, stable-1.3, stable-1.5

No need for notice after removing/marking as spam 

comment removals and spam marking happens through AJAX

ActionItem2306
Showing 1 changed file with 0 additions and 2 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @8aad796
... ... @@ -155,7 +155,6 @@ class ContentViewerController < ApplicationController
155 155 @comment = @page.comments.find(params[:remove_comment])
156 156 if (user == @comment.author || user == @page.profile || user.has_permission?(:moderate_comments, @page.profile))
157 157 @comment.destroy
158   - session[:notice] = _('Comment succesfully deleted')
159 158 end
160 159 finish_comment_handling
161 160 end
... ... @@ -164,7 +163,6 @@ class ContentViewerController < ApplicationController
164 163 @comment = @page.comments.find(params[:mark_comment_as_spam])
165 164 if logged_in? && (user == @page.profile || user.has_permission?(:moderate_comments, @page.profile))
166 165 @comment.spam!
167   - session[:notice] = _('Comment succesfully marked as SPAM')
168 166 end
169 167 finish_comment_handling
170 168 end
... ...