From 20493106cd3ffe59510de3826ce994acc5738a3d Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 7 May 2013 17:56:56 +1000 Subject: [PATCH] fix post trashing --- .../javascripts/discourse/controllers/topic_controller.js | 2 +- app/controllers/posts_controller.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/topic_controller.js b/app/assets/javascripts/discourse/controllers/topic_controller.js index 4ae25599036..1cc55eeb123 100644 --- a/app/assets/javascripts/discourse/controllers/topic_controller.js +++ b/app/assets/javascripts/discourse/controllers/topic_controller.js @@ -432,7 +432,7 @@ Discourse.TopicController = Discourse.ObjectController.extend({ deletePost: function(post) { // Moderators can delete posts. Regular users can only create a deleted at message. - if (Discourse.get('currentUser.moderator')) { + if (Discourse.get('currentUser.staff')) { post.set('deleted_at', new Date()); } else { post.set('cooked', Discourse.Markdown.cook(Em.String.i18n("post.deleted_by_author"))); diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index f94381c1ec9..cfc5971fd64 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -186,8 +186,8 @@ class PostsController < ApplicationController def find_post_from_params finder = Post.where(id: params[:id] || params[:post_id]) - # Include deleted posts if the user is a moderator - finder = finder.with_deleted if current_user.try(:moderator?) + # Include deleted posts if the user is staff + finder = finder.with_deleted if current_user.try(:staff?) post = finder.first guardian.ensure_can_see!(post)