AO3-5520 Admin roles restrict ability to add or modify wrangling guidelines

app/controllers/wrangling_guidelines_controller.rb

@@ -1,9 +1,9 @@
-class WranglingGuidelinesController < ApplicationController
+class WranglingGuidelinesController < ApplicationController  
   before_action :admin_only, except: [:index, :show]
 
   # GET /wrangling_guidelines
   def index
-    @wrangling_guidelines = WranglingGuideline.order('position ASC')
+    @wrangling_guidelines = WranglingGuideline.order("position ASC")
   end
 
   # GET /wrangling_guidelines/1
@@ -13,57 +13,64 @@ def show
 
   # GET /wrangling_guidelines/new
   def new
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.new
   end
 
   # GET /wrangling_guidelines/1/edit
   def edit
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.find(params[:id])
   end
 
   # GET /wrangling_guidelines/manage
   def manage
-    @wrangling_guidelines = WranglingGuideline.order('position ASC')
+    authorize :wrangling
+    @wrangling_guidelines = WranglingGuideline.order("position ASC")
   end
 
   # POST /wrangling_guidelines
   def create
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.new(wrangling_guideline_params)
 
     if @wrangling_guideline.save
-      flash[:notice] = ts('Wrangling Guideline was successfully created.')
+      flash[:notice] = t("wrangling_guidelines.create")
       redirect_to(@wrangling_guideline)
     else
-      render action: 'new'
+      render action: "new"
     end
   end
 
   # PUT /wrangling_guidelines/1
   def update
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.find(params[:id])
 
     if @wrangling_guideline.update(wrangling_guideline_params)
-      flash[:notice] = ts('Wrangling Guideline was successfully updated.')
+      flash[:notice] = t("wrangling_guidelines.update")
       redirect_to(@wrangling_guideline)
     else
-      render action: 'edit'
+      render action: "edit"
     end
   end
 
   # reorder FAQs
   def update_positions
+    authorize :wrangling
     if params[:wrangling_guidelines]
       @wrangling_guidelines = WranglingGuideline.reorder_list(params[:wrangling_guidelines])
-      flash[:notice] = ts('Wrangling Guidelines order was successfully updated.')
+      flash[:notice] = t("wrangling_guidelines.reorder")
     end
     redirect_to(wrangling_guidelines_path)
   end
 
   # DELETE /wrangling_guidelines/1
   def destroy
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.find(params[:id])
     @wrangling_guideline.destroy
-    flash[:notice] = ts('Wrangling Guideline was successfully deleted.')
+    flash[:notice] = t("wrangling_guidelines.delete")
     redirect_to(wrangling_guidelines_path)
   end
 
@@ -72,5 +79,4 @@ def destroy
   def wrangling_guideline_params
     params.require(:wrangling_guideline).permit(:title, :content)
   end
-
 end

app/policies/wrangling_policy.rb

@@ -11,4 +11,9 @@ def full_access?
   alias destroy? full_access?
   alias show? full_access?
   alias report_csv? full_access?
+  alias new? full_access?
+  alias edit? full_access?
+  alias manage? full_access?
+  alias update? full_access?
+  alias update_positions? full_access?
 end

app/views/admin/_admin_nav.html.erb

@@ -9,7 +9,7 @@
 </li>
   <% if params[:controller] == "admin_posts" && params[:action] == "edit" %>
     <li>
-      <%= link_to t("admin.admin_nav.delete", default: "Delete Post"),
+      <%= link_to t(".news.delete_post"),
                   @admin_post,
                   data: { confirm: "Are you sure you want to delete this news post?" },
                   method: :delete %>
@@ -29,8 +29,9 @@
   <li>
     <%= span_if_current ts("Known Issues", key: "header"), known_issues_path %>
   </li>
-  <li>
-    <%= span_if_current ts("Wrangling Guidelines", key: "header"),
-                        wrangling_guidelines_path %>
-  </li>
+  <% if policy(:wrangling).new? %>
+    <li>
+      <%= span_if_current t(".wrangling_guidelines"), wrangling_guidelines_path %>
+    </li>
+  <% end %>
 </ul>

app/views/admin/_header.html.erb

@@ -29,7 +29,9 @@
         <% end %>
         <li><%= link_to t(".nav.posts.faqs"), archive_faqs_path %></li>
         <li><%= link_to t(".nav.posts.known_issues"), known_issues_path %></li>
-        <li><%= link_to t(".nav.posts.wrangling_guidelines"), wrangling_guidelines_path %></li>
+        <% if policy(:wrangling).new? %>
+          <li><%= link_to t(".nav.posts.wrangling_guidelines"), wrangling_guidelines_path %></li>
+        <% end %>
       </ul>
     </li>
     <% if policy(AdminBlacklistedEmail).index? %>

app/views/wrangling_guidelines/index.html.erb

@@ -1,5 +1,5 @@
 <!--Descriptive page name, messages and instructions-->
-<% if logged_in_as_admin? %>
+<% if policy(:wrangling).new? %>
   <%= render 'admin_index' %>
 <% else %>
   <h2 class="heading"><%= ts('Wrangling Guidelines') %></h2>

app/views/wrangling_guidelines/show.html.erb

@@ -8,7 +8,7 @@
 
 <!--main content-->
 <div class="admin" role="article">
-  <% if logged_in_as_admin? %>
+  <% if policy(:wrangling).edit? %>
     <div class="header">
       <h3 class="heading">
         Updated: <%=h @wrangling_guideline.updated_at %> | <%= link_to ts('Edit'), edit_wrangling_guideline_path(@wrangling_guideline) %>

config/i18n-tasks.yml

@@ -149,8 +149,6 @@ ignore_missing:
   - successfully_sent # should be feedbacks.create.successfully_sent
   # Files: app/controllers/languages_controller.rb and app/controllers/locales_controller.rb
   - successfully_added # should be languages.create.successfully_added and locales.create.successfully_added
-  # Files: app/views/admin/_admin_nav.html.erb and app/views/admin_posts/show.html.erb
-  - admin.admin_nav.delete
   # File: app/views/admin/admin_invitations/find.html.erb
   - admin.admin_invitations.find.find_email
   - admin.admin_invitations.find.find_token

config/locales/controllers/en.yml

@@ -108,3 +108,8 @@ en:
       ban_notice_html: Your account has been banned. You are not permitted to add or edit archive content. Please %{contact_abuse_link} for more information.
       contact_abuse: contact Abuse
       suspension_notice_html: Your account has been suspended until %{suspended_until}. You may not add or edit content until your suspension has been resolved. Please %{contact_abuse_link} for more information.
+  wrangling_guidelines:
+    create: Wrangling Guideline was successfully created.
+    delete: Wrangling Guideline was successfully deleted.
+    reorder: Wrangling Guidelines order was successfully updated.
+    update: Wrangling Guideline was successfully updated.

config/locales/views/en.yml

@@ -91,6 +91,10 @@ en:
           queue: Manage Queue
           requests: Manage Requests
         page_heading: Invite New Users
+    admin_nav:
+      news:
+        delete_post: Delete Post
+      wrangling_guidelines: Wrangling Guidelines
     admin_options:
       delete:
         bookmark: Delete Bookmark

features/step_definitions/tag_steps.rb

@@ -197,7 +197,7 @@
 end
 
 Given /^I have posted a Wrangling Guideline?(?: titled "([^\"]*)")?$/ do |title|
-  step %{I am logged in as an admin}
+  step %{I am logged in as a "tag_wrangling" admin}
   visit new_wrangling_guideline_path
   if title
     fill_in("Guideline text", with: "This is a page about how we wrangle things.")

features/tags_and_wrangling/tag_wrangling_relationships.feature

@@ -14,7 +14,7 @@ Scenario: relationship wrangling - syns, mergers, characters, autocompletes
     And a canonical character "Zoe Washburne"
     And a canonical character "Jack Harkness"
     And a canonical character "Ianto Jones"
-    And I am logged in as an admin
+    And I am logged in as a "tag_wrangling" admin
     And I follow "Tag Wrangling"
 
   # create a new canonical relationship from tag wrangling interface

features/tags_and_wrangling/wrangling_guidelines.feature

@@ -6,7 +6,7 @@ Feature: Wrangling Guidelines
 
   Scenario: Post a Wrangling Guideline
 
-  Given I am logged in as an admin
+  Given I am logged in as a "tag_wrangling" admin
     And I am on the wrangling guidelines page
   And I follow "New Wrangling Guideline"
     And I fill in "Guideline text" with "This series of documents (Wrangling Guidelines) are intended to help tag wranglers remain consistent as they go about the business of wrangling tags by providing a set of formatting guidelines."
@@ -29,7 +29,7 @@ Feature: Wrangling Guidelines
 
   Scenario: Reorder Wrangling Guidelines
 
-  Given I am logged in as an admin
+  Given I am logged in as a "tag_wrangling" admin
     And 3 Wrangling Guidelines exist
   When I go to the Wrangling Guidelines reorder page
     And I fill in "wrangling_guidelines_1" with "3"
@@ -44,7 +44,7 @@ Feature: Wrangling Guidelines
 
   Scenario: Delete Wrangling Guideline
 
-  Given I am logged in as an admin
+  Given I am logged in as a "tag_wrangling" admin
     And I have posted a Wrangling Guideline titled "Relationship Tags"
   When I go to the Wrangling Guidelines page
     And I follow "Delete"