\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars b/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
index 4e0b5054339..190a7c64bd4 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
@@ -1,36 +1,30 @@
- {{#if flagsAvailable}}
-
+
+
+
-{{#if showSubmit}}
-
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.js.handlebars b/app/assets/javascripts/discourse/templates/modal/invite.js.handlebars
index 5d8e3cfb1be..e64b1d59e1f 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/invite.js.handlebars
@@ -17,7 +17,7 @@
\ No newline at end of file
diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb
index ecda9ffa3e9..bc781934423 100644
--- a/app/controllers/post_actions_controller.rb
+++ b/app/controllers/post_actions_controller.rb
@@ -9,7 +9,11 @@ class PostActionsController < ApplicationController
def create
guardian.ensure_post_can_act!(@post, PostActionType.types[@post_action_type_id])
- post_action = PostAction.act(current_user, @post, @post_action_type_id, params[:message])
+ args = {}
+ args[:message] = params[:message] if params[:message].present?
+ args[:take_action] = true if guardian.is_staff? and params[:take_action] == 'true'
+
+ post_action = PostAction.act(current_user, @post, @post_action_type_id, args)
if post_action.blank? || post_action.errors.present?
render_json_error(post_action)
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 02b9696de39..ca65b67adf5 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -8,7 +8,7 @@ class PostAction < ActiveRecord::Base
include RateLimiter::OnCreateRecord
include Trashable
- attr_accessible :post_action_type_id, :post_id, :user_id, :post, :user, :post_action_type, :message, :related_post_id
+ attr_accessible :post_action_type_id, :post_id, :user_id, :post, :user, :post_action_type, :message, :related_post_id, :staff_took_action
belongs_to :post
belongs_to :user
@@ -70,11 +70,11 @@ class PostAction < ActiveRecord::Base
update_flagged_posts_count
end
- def self.act(user, post, post_action_type_id, message = nil)
+ def self.act(user, post, post_action_type_id, opts={})
begin
title, target_usernames, target_group_names, subtype, body = nil
- if message
+ if opts[:message]
[:notify_moderators, :notify_user].each do |k|
if post_action_type_id == PostActionType.types[k]
if k == :notify_moderators
@@ -85,7 +85,7 @@ class PostAction < ActiveRecord::Base
title = I18n.t("post_action_types.#{k}.email_title",
title: post.topic.title)
body = I18n.t("post_action_types.#{k}.email_body",
- message: message,
+ message: opts[:message],
link: "#{Discourse.base_url}#{post.url}")
subtype = k == :notify_moderators ? TopicSubtype.notify_moderators : TopicSubtype.notify_user
end
@@ -103,10 +103,12 @@ class PostAction < ActiveRecord::Base
raw: body
).create.id
end
+
create( post_id: post.id,
user_id: user.id,
post_action_type_id: post_action_type_id,
- message: message,
+ message: opts[:message],
+ staff_took_action: opts[:take_action] || false,
related_post_id: related_post_id )
rescue ActiveRecord::RecordNotUnique
# can happen despite being .create
@@ -177,13 +179,13 @@ class PostAction < ActiveRecord::Base
# can weigh flags differently.
def self.flag_counts_for(post_id)
flag_counts = exec_sql("SELECT SUM(CASE
- WHEN pa.deleted_at IS NULL AND u.admin THEN :flags_required_to_hide_post
- WHEN pa.deleted_at IS NULL AND (NOT u.admin) THEN 1
+ WHEN pa.deleted_at IS NULL AND pa.staff_took_action THEN :flags_required_to_hide_post
+ WHEN pa.deleted_at IS NULL AND (NOT pa.staff_took_action) THEN 1
ELSE 0
END) AS new_flags,
SUM(CASE
- WHEN pa.deleted_at IS NOT NULL AND u.admin THEN :flags_required_to_hide_post
- WHEN pa.deleted_at IS NOT NULL AND (NOT u.admin) THEN 1
+ WHEN pa.deleted_at IS NOT NULL AND pa.staff_took_action THEN :flags_required_to_hide_post
+ WHEN pa.deleted_at IS NOT NULL AND (NOT pa.staff_took_action) THEN 1
ELSE 0
END) AS old_flags
FROM post_actions AS pa
@@ -234,7 +236,8 @@ class PostAction < ActiveRecord::Base
reason = old_flags > 0 ? Post.hidden_reasons[:flag_threshold_reached_again] : Post.hidden_reasons[:flag_threshold_reached]
Post.update_all(["hidden = true, hidden_reason_id = COALESCE(hidden_reason_id, ?)", reason], id: post_id)
Topic.update_all({ visible: false },
- ["id = :topic_id AND NOT EXISTS(SELECT 1 FROM POSTS WHERE topic_id = :topic_id AND NOT hidden)", topic_id: post.topic_id])
+ ["id = :topic_id AND NOT EXISTS(SELECT 1 FROM POSTS WHERE topic_id = :topic_id AND NOT hidden)",
+ topic_id: post.topic_id])
# inform user
if post.user
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index de7761ba415..9c608f7026c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -831,6 +831,7 @@ en:
flagging:
title: 'Why are you flagging this post?'
action: 'Flag Post'
+ take_action: "Take Action"
notify_action: 'Notify'
cant: "Sorry, you can't flag this post at this time."
custom_placeholder_notify_user: "Why does this post require you to speak to this user directly and privately? Be specific, be constructive, and always be kind."
diff --git a/db/migrate/20130531210816_add_staff_took_action_to_post_actions.rb b/db/migrate/20130531210816_add_staff_took_action_to_post_actions.rb
new file mode 100644
index 00000000000..3b6c2c3684e
--- /dev/null
+++ b/db/migrate/20130531210816_add_staff_took_action_to_post_actions.rb
@@ -0,0 +1,5 @@
+class AddStaffTookActionToPostActions < ActiveRecord::Migration
+ def change
+ add_column :post_actions, :staff_took_action, :boolean, default: false, null: false
+ end
+end
diff --git a/spec/controllers/post_actions_controller_spec.rb b/spec/controllers/post_actions_controller_spec.rb
index 29a782a7f9c..3c0fed3d2ae 100644
--- a/spec/controllers/post_actions_controller_spec.rb
+++ b/spec/controllers/post_actions_controller_spec.rb
@@ -9,7 +9,7 @@ describe PostActionsController do
describe 'logged in' do
before do
- @user = log_in
+ @user = log_in(:moderator)
@post = Fabricate(:post, user: Fabricate(:coding_horror))
end
@@ -34,9 +34,26 @@ describe PostActionsController do
end
it 'allows us to create an post action on a post' do
- PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], nil)
+ PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {})
xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like]
end
+
+ it 'passes the message through' do
+ PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {message: 'action message goes here'})
+ xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here'
+ end
+
+ it 'passes take_action through' do
+ PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {take_action: true})
+ xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], take_action: 'true'
+ end
+
+ it "doesn't pass take_action through if the user isn't staff" do
+ Guardian.any_instance.stubs(:is_staff?).returns(false)
+ PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {})
+ xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], take_action: 'true'
+ end
+
end
end
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index e79236dcd37..66da90ba8cc 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -21,7 +21,7 @@ describe PostAction do
it "notify moderators integration test" do
mod = moderator
- action = PostAction.act(codinghorror, post, PostActionType.types[:notify_moderators], "this is my special long message");
+ action = PostAction.act(codinghorror, post, PostActionType.types[:notify_moderators], message: "this is my special long message");
posts = Post.joins(:topic)
.select('posts.id, topics.subtype, posts.topic_id')
@@ -50,7 +50,7 @@ describe PostAction do
it "sends an email to all moderators if selected" do
post = build(:post, id: 1000)
PostCreator.any_instance.expects(:create).returns(post)
- PostAction.act(build(:user), build(:post), PostActionType.types[:notify_moderators], "this is my special message");
+ PostAction.act(build(:user), build(:post), PostActionType.types[:notify_moderators], message: "this is my special message");
end
end
@@ -63,7 +63,7 @@ describe PostAction do
it "sends an email to user if selected" do
PostCreator.any_instance.expects(:create).returns(build(:post))
- PostAction.act(build(:user), post, PostActionType.types[:notify_user], "this is my special message");
+ PostAction.act(build(:user), post, PostActionType.types[:notify_user], message: "this is my special message");
end
end
end
@@ -179,9 +179,9 @@ describe PostAction do
flag = PostAction.act(Fabricate(:evil_trout), post, PostActionType.types[:spam])
PostAction.flag_counts_for(post.id).should == [0, 1]
- # If an admin flags the post, it is counted higher
+ # If staff takes action, it is ranked higher
admin = Fabricate(:admin)
- PostAction.act(admin, post, PostActionType.types[:spam])
+ pa = PostAction.act(admin, post, PostActionType.types[:spam], take_action: true)
PostAction.flag_counts_for(post.id).should == [0, 8]
# If a flag is dismissed