Merge branch 'issues/collideoscope/30-user-moderation'

4 files changed, 19 insertions, 16 deletions

diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index adb56190d..e5094d02e 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -1,4 +1,4 @@
-[% permissions = c.user.permissions(c, problem.bodies_str) %]
+[% permissions = c.user.permissions(problem) %]
 [% second_column = BLOCK -%]
   <div id="side-inspect">
 
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index fe0fe74d5..1e427fd86 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -1,3 +1,5 @@
+[% can_moderate = permissions.moderate OR c.user.can_moderate(problem, staff = permissions.moderate) %]
+
 <a href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]"
     class="problem-back js-back-to-report-list">[% loc('Back to all reports') %]</a>
 
@@ -30,7 +32,7 @@
 </form>
 [% END %]
 
-  [% IF permissions.moderate %]
+  [% IF can_moderate %]
     [% original = problem_original %]
     <form method="post" action="/moderate/report/[% problem.id %]">
         <input type="hidden" name="token" value="[% csrf_token %]">
@@ -38,7 +40,7 @@
 
     <h1 class="moderate-display">[% problem.title | html %]</h1>
 
-  [% IF permissions.moderate %]
+  [% IF can_moderate %]
     <div class="moderate-edit">
       [% IF problem.title != original.title %]
         <label>
@@ -71,11 +73,11 @@
 
     [% INCLUDE 'report/_support.html' %]
 
-  [% IF permissions.moderate %]
+  [% IF can_moderate %]
     [% IF problem.photo or original.photo %]
         <p class="moderate-edit">
             <label>
-                <input type="checkbox" name="problem_show_photo" [% problem.photo ? 'checked' : '' %]>
+                <input type="checkbox" name="problem_photo" [% problem.photo ? 'checked' : '' %]>
                 [% loc('Show photo') %]
             </label>
         </p>
@@ -87,7 +89,7 @@
         [% problem.detail | add_links | html_para %]
     </div>
 
-  [% IF permissions.moderate %]
+  [% IF can_moderate %]
     <p class="moderate-edit">
       [% IF problem.detail != original.detail %]
         <label>
@@ -116,13 +118,13 @@
     </div>
   [% END %]
 
-  [% IF permissions.moderate %]
+  [% IF can_moderate %]
     </form>
   [% END %]
 
-  [% IF permissions.moderate OR permissions.planned_reports %]
+  [% IF can_moderate OR permissions.planned_reports %]
     <div class="moderate-display segmented-control" role="menu">
-      [% IF permissions.moderate %]
+      [% IF can_moderate %]
         <a class="js-moderate btn" role="menuitem" aria-label="[% loc('Moderate this report') %]">[% loc('Moderate') %]</a>
       [% END %]
       [% IF permissions.planned_reports %]
diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html
index ebe969994..eedbc4f85 100644
--- a/templates/web/base/report/display.html
+++ b/templates/web/base/report/display.html
@@ -40,7 +40,7 @@
 
 [% INCLUDE 'report/banner.html' %]
 [% IF c.user_exists %]
-    [% DEFAULT permissions = c.user.permissions(c, problem.bodies_str) %]
+    [% DEFAULT permissions = c.user.permissions(problem) %]
 [%- END %]
 [% INCLUDE 'report/_main.html' %]
 
diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html
index 4a2642c9a..122dbfe3b 100644
--- a/templates/web/base/report/update.html
+++ b/templates/web/base/report/update.html
@@ -1,3 +1,4 @@
+[% can_moderate = permissions.moderate OR c.user.can_moderate(update, staff = permissions.moderate) %]
 [% IF loop.first %]
 <section class="full-width">
     <h4 class="static-with-rule">[% loc('Updates') %]</h4>
@@ -5,7 +6,7 @@
 [% END %]
         <li class="item-list__item item-list__item--updates">
             <a name="update_[% update.id %]" class="internal-link-fixed-header"></a>
-          [% IF permissions.moderate; original_update = update.moderation_original_data %]
+          [% IF can_moderate; original_update = update.moderation_original_data %]
             <form method="post" action="/moderate/report/[% problem.id %]/update/[% update.id %]">
                 <input type="hidden" name="token" value="[% csrf_token %]">
                 <input type="button" class="btn js-moderate moderate-display" value="[% loc('Moderate this update') %]">
@@ -15,7 +16,7 @@
                     <label><input type="checkbox" name="update_show_name" [% update.anonymous ? '' : 'checked' %]>
                     [% loc('Show name publicly?') %]</label>
                     [% IF update.photo or original_update.photo %]
-                        <label><input type="checkbox" name="update_show_photo" [% update.photo ? 'checked' : '' %]>
+                        <label><input type="checkbox" name="update_photo" [% update.photo ? 'checked' : '' %]>
                         [% loc('Show Photo?') %]</label>
                     [% END %]
                 </div>
@@ -31,13 +32,13 @@
                     <div class="moderate-display">
                         [% update.text | add_links | markup(update.user) | html_para %]
                     </div>
-                    [% IF permissions.moderate %]
+                    [% IF can_moderate %]
                     <div class="moderate-edit">
                         [% IF update.text != original.detail %]
-                        <label><input type="checkbox" name="update_revert_detail" class="revert-textarea">
+                        <label><input type="checkbox" name="update_revert_text" class="revert-textarea">
                         [% loc('Revert to original') %]</label>
                         [% END %]
-                        <textarea class="form-control" name="update_detail">[% update.text | add_links %]</textarea>
+                        <textarea class="form-control" name="update_text">[% update.text | add_links %]</textarea>
                     </div>
                     [% END %]
 
@@ -45,7 +46,7 @@
                 </div>
             [% END %]
             </div>
-            [% IF permissions.moderate %]
+            [% IF can_moderate %]
                 <div class="moderate-edit">
                     <label for="moderation_reason">[% loc('Describe why you are moderating this') %]</label>
                     <input type="text" class="form-control" name="moderation_reason">