address bilka2 comments

otwcode · Sep 13, 2024 · 0858f9a · 0858f9a
1 parent 67faec0
commit 0858f9a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/app/controllers/wrangling_guidelines_controller.rb b/app/controllers/wrangling_guidelines_controller.rb
@@ -1,6 +1,4 @@
-class WranglingGuidelinesController < ApplicationController
-  include WranglingHelper
-
+class WranglingGuidelinesController < ApplicationController  
   before_action :admin_only, except: [:index, :show]
 
   # GET /wrangling_guidelines
@@ -15,25 +13,25 @@ def show
 
   # GET /wrangling_guidelines/new
   def new
-    authorize :wrangling if logged_in_as_admin?
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.new
   end
 
   # GET /wrangling_guidelines/1/edit
   def edit
-    authorize :wrangling if logged_in_as_admin?
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.find(params[:id])
   end
 
   # GET /wrangling_guidelines/manage
   def manage
-    authorize :wrangling if logged_in_as_admin?
+    authorize :wrangling
     @wrangling_guidelines = WranglingGuideline.order("position ASC")
   end
 
   # POST /wrangling_guidelines
   def create
-    authorize :wrangling if logged_in_as_admin?
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.new(wrangling_guideline_params)
 
     if @wrangling_guideline.save
@@ -46,7 +44,7 @@ def create
 
   # PUT /wrangling_guidelines/1
   def update
-    authorize :wrangling if logged_in_as_admin?
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.find(params[:id])
 
     if @wrangling_guideline.update(wrangling_guideline_params)
@@ -59,7 +57,7 @@ def update
 
   # reorder FAQs
   def update_positions
-    authorize :wrangling if logged_in_as_admin?
+    authorize :wrangling
     if params[:wrangling_guidelines]
       @wrangling_guidelines = WranglingGuideline.reorder_list(params[:wrangling_guidelines])
       flash[:notice] = t("wrangling_guidelines.reorder")
@@ -69,7 +67,7 @@ def update_positions
 
   # DELETE /wrangling_guidelines/1
   def destroy
-    authorize :wrangling if logged_in_as_admin?
+    authorize :wrangling
     @wrangling_guideline = WranglingGuideline.find(params[:id])
     @wrangling_guideline.destroy
     flash[:notice] = t("wrangling_guidelines.delete")

diff --git a/app/views/admin/_admin_nav.html.erb b/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"),
+      <%= link_to t(".news.delete_post"),
                   @admin_post,
                   data: { confirm: "Are you sure you want to delete this news post?" },
                   method: :delete %>
@@ -31,7 +31,7 @@
   </li>
   <% if policy(:wrangling).new? %>
     <li>
-      <%= span_if_current t("admin.admin_nav.wrangling_guidelines"), wrangling_guidelines_path %>
+      <%= span_if_current t(".wrangling_guidelines"), wrangling_guidelines_path %>
     </li>
   <% end %>
 </ul>
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
@@ -92,7 +92,8 @@ en:
           requests: Manage Requests
         page_heading: Invite New Users
     admin_nav:
-      delete: Delete Post
+      news:
+        delete_post: Delete Post
       wrangling_guidelines: Wrangling Guidelines
     admin_options:
       delete: