adminとメンターの権限を整理した

fjordllc · Dec 8, 2021 · 4520283 · 4520283
1 parent 92c4fda
commit 4520283
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -61,7 +61,7 @@ def set_page
 
   def page_params
     keys = %i[title body tag_list practice_id slug]
-    keys << :user_id if admin_login?
+    keys << :user_id if admin_or_mentor_login?
     params.require(:page).permit(*keys)
   end
 

diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb
@@ -50,7 +50,7 @@ def work_params
   end
 
   def set_my_work
-    @work = if admin_login?
+    @work = if admin_or_mentor_login?
               Work.find(params[:id])
             else
               current_user.works.find(params[:id])

diff --git a/app/views/application/_global_nav.slim b/app/views/application/_global_nav.slim
@@ -16,7 +16,7 @@ nav.global-nav
               i.fas.fa-fw.fa-book
             .global-nav-links__link-label プラクティス
         li.global-nav-links__item
-          - report_link = mentor_login? ? reports_unchecked_index_path : reports_path
+          - report_link = admin_or_mentor_login? ? reports_unchecked_index_path : reports_path
           = link_to report_link, class: "global-nav-links__link #{current_link(/^reports/)}" do
             .global-nav-links__link-icon
               i.fas.fa-fw.fa-pen
@@ -30,7 +30,7 @@ nav.global-nav
             = link_to products_link, class: "global-nav-links__link #{current_link(/^products/)}" do
               .global-nav-links__link-icon
                 i.fas.fa-fw.fa-hand-paper
-              - if admin_login? || mentor_login? && Cache.unassigned_product_count.positive?
+              - if admin_or_mentor_login? && Cache.unassigned_product_count.positive?
                 .global-nav__item-count.a-notification-count.is-only-mentor
                   = Cache.unassigned_product_count
               .global-nav-links__link-label 提出物

diff --git a/app/views/products/_form.html.slim b/app/views/products/_form.html.slim
@@ -13,7 +13,7 @@
             | プレビュー
           .js-preview.is-long-text.markdown-form__preview
     .form-item
-      - if admin_login?
+      - if admin_or_mentor_login?
         .col-md-3.col-xs-6
           .a-form-label
             | 担当者