From 95219401defbe6ed3e92bd4700f2d157b447245f Mon Sep 17 00:00:00 2001
From: Brian Michalski <bmichalski@gmail.com>
Date: Tue, 27 Nov 2012 23:09:16 -0800
Subject: [PATCH] Hide moderation for non-moderators.  Close #240.

Also test this to try and prevent it from sneaking in again.
---
 .../submissions/_submission_listgriditem.html.erb    |  2 +-
 test/functional/submissions_controller_test.rb       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/views/submissions/_submission_listgriditem.html.erb b/app/views/submissions/_submission_listgriditem.html.erb
index 828ed2190..718faf0d9 100644
--- a/app/views/submissions/_submission_listgriditem.html.erb
+++ b/app/views/submissions/_submission_listgriditem.html.erb
@@ -13,7 +13,7 @@
         <% end -%>
       </p>
 
-      <% unless submission.content.is_expired? %>
+      <% if can?(:update, submission) && !submission.content.is_expired? %>
       <p>
         <%= link_to t(:moderate), "#", :class => "btn small dropdown-control dd-moderate", :title => t(:moderate_title, :name => submission.content.name), :rel => "#moderate_#{ submission.id }" %>
       </p>
diff --git a/test/functional/submissions_controller_test.rb b/test/functional/submissions_controller_test.rb
index cc473691c..5e41eaecf 100644
--- a/test/functional/submissions_controller_test.rb
+++ b/test/functional/submissions_controller_test.rb
@@ -12,4 +12,16 @@ def setup
     assert_redirected_to feed_submissions_path(feeds(:boring_announcements))
   end
 
+  test "show feed does not have moderation" do
+    get :index, :feed_id => feeds(:service).id
+    assert_select ".dd-moderate", 0
+    assert_select "button", 0
+  end
+
+  test "feed moderator sees moderation" do
+    sign_in users(:katie)
+    get :index, :feed_id => feeds(:service).id
+    assert_select ".dd-moderate", feeds(:service).submissions.active.count
+  end
+
 end