diff --git a/app/controllers/admin/broadcast_announcements_controller.rb b/app/controllers/admin/broadcast_announcements_controller.rb index ea32fd7a32..ba0749cb7a 100644 --- a/app/controllers/admin/broadcast_announcements_controller.rb +++ b/app/controllers/admin/broadcast_announcements_controller.rb @@ -3,7 +3,7 @@ class Admin::BroadcastAnnouncementsController < AdminController before_action :require_admin def require_admin - verboten! unless current_user.has_role?(Role::SUPER_ADMIN) + verboten! unless current_user.has_cached_role?(Role::SUPER_ADMIN) end def index diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 4661e3f68b..d7e922009b 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -3,7 +3,7 @@ class AdminController < ApplicationController before_action :require_admin def require_admin - verboten! unless current_user.has_role?(Role::SUPER_ADMIN) + verboten! unless current_user.has_cached_role?(Role::SUPER_ADMIN) end def dashboard diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e80333a9ee..68779e92c3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -59,22 +59,21 @@ def dashboard_path_from_current_role def authorize_user return unless params[:controller] # part of omniauth controller flow verboten! unless params[:controller].include?("devise") || - current_user.has_role?(Role::SUPER_ADMIN) || - current_user.has_role?(Role::ORG_USER, current_organization) || - current_user.has_role?(Role::ORG_ADMIN, current_organization) || - current_user.has_role?(Role::PARTNER, current_partner) + current_user.has_cached_role?(Role::SUPER_ADMIN) || + current_user.has_cached_role?(Role::ORG_USER, current_organization) || + current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) || + current_user.has_cached_role?(Role::PARTNER, current_partner) end def authorize_admin - verboten! unless current_user.has_role?(Role::SUPER_ADMIN) || - current_user.has_role?(Role::ORG_ADMIN, current_organization) + verboten! unless current_user.has_cached_role?(Role::SUPER_ADMIN) || + current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) end def log_active_user if current_user && should_update_last_request_at? # we don't want the user record to validate or run callbacks when we're tracking activity current_user.update_columns(last_request_at: Time.now.utc) - end end diff --git a/app/controllers/distributions_controller.rb b/app/controllers/distributions_controller.rb index 98e4abd848..a9ebae8e54 100644 --- a/app/controllers/distributions_controller.rb +++ b/app/controllers/distributions_controller.rb @@ -177,7 +177,7 @@ def edit @distribution = Distribution.includes(:line_items).includes(:storage_location).find(params[:id]) @distribution.initialize_request_items if (!@distribution.complete? && @distribution.future?) || - current_user.has_role?(Role::ORG_ADMIN, current_organization) + current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) @distribution.line_items.build if @distribution.line_items.size.zero? @items = current_organization.items.active.alphabetized @partner_list = current_organization.partners.alphabetized diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index b10cbce8e1..cd19587561 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -81,8 +81,8 @@ def remove_user private def authorize_user - verboten! unless current_user.has_role?(Role::SUPER_ADMIN) || - current_user.has_role?(Role::ORG_USER, current_organization) + verboten! unless current_user.has_cached_role?(Role::SUPER_ADMIN) || + current_user.has_cached_role?(Role::ORG_USER, current_organization) end def organization_params @@ -121,7 +121,7 @@ def request_type_formatter(params) end def user_update_redirect_path - if current_user.has_role?(Role::SUPER_ADMIN) + if current_user.has_cached_role?(Role::SUPER_ADMIN) admin_organization_path(current_organization.id) else organization_path diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9c16d713ad..8c549c6624 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -23,7 +23,7 @@ def menu_open?(controller_action_names) end def can_administrate? - current_user.has_role?(Role::ORG_ADMIN, current_organization) + current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) end def navigation_link_to(*args) diff --git a/app/views/distributions/show.html.erb b/app/views/distributions/show.html.erb index 040cba7f36..fe2b75ecca 100644 --- a/app/views/distributions/show.html.erb +++ b/app/views/distributions/show.html.erb @@ -83,7 +83,7 @@
<%= update_button_to picked_up_distribution_path(@distribution), {text: "Distribution Complete", size: "md"} if @distribution.scheduled? %> - <% if @distribution.future? || current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <% if @distribution.future? || current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %> <%= edit_button_to edit_distribution_path(@distribution), { text: "Make a Correction", enabled: !@distribution.has_inactive_item?, diff --git a/app/views/donations/show.html.erb b/app/views/donations/show.html.erb index b13ed109b2..948fdcb57c 100644 --- a/app/views/donations/show.html.erb +++ b/app/views/donations/show.html.erb @@ -75,7 +75,7 @@ enabled: !@donation.has_inactive_item?, size: "md" } %> <%= new_button_to new_distribution_path(donation_id: @donation.id, storage_location_id: @donation.storage_location_id), { text: "Start a new Distribution" } %> - <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %> <%= delete_button_to donation_path(@donation), { size: "md", enabled: !@donation.has_inactive_item?, diff --git a/app/views/item_categories/show.html.erb b/app/views/item_categories/show.html.erb index ed30e02118..ab75eb44ce 100644 --- a/app/views/item_categories/show.html.erb +++ b/app/views/item_categories/show.html.erb @@ -77,7 +77,7 @@ <%= item.name %> <%= view_button_to item_path(item) %> - <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %> <%= delete_button_to(remove_category_item_path(item), method: :patch, text: "Remove from category") %> <% end %> diff --git a/app/views/items/_form.html.erb b/app/views/items/_form.html.erb index 15dc7ebbb3..ee6d4b9274 100644 --- a/app/views/items/_form.html.erb +++ b/app/views/items/_form.html.erb @@ -30,7 +30,7 @@ <%= f.input_field :distribution_quantity, class: "form-control" %> <% end %> - <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %> <%= f.input :name, label: "On hand minimum quantity", wrapper: :input_group do %> <%= f.input_field :on_hand_minimum_quantity, input_html: {value: 0}, class: "form-control" %> <% end %> diff --git a/app/views/layouts/_lte_navbar.html.erb b/app/views/layouts/_lte_navbar.html.erb index f2abf12076..fa66552b8e 100644 --- a/app/views/layouts/_lte_navbar.html.erb +++ b/app/views/layouts/_lte_navbar.html.erb @@ -50,7 +50,7 @@ <%= "Switch to: #{role.resource&.name || "Super Admin"}" %> <% end %> <% end %> - <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
<%= link_to users_path, class:"dropdown-item" do %> My Co-Workers diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index fe4ab55639..9f4842529a 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -113,7 +113,7 @@ Inventory Adjustments <% end %> - <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
  • <%= link_to(audits_path, class: "nav-link #{active_class(['audits'])}") do %> Inventory Audit @@ -246,7 +246,7 @@
    • - <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
  • <%= link_to(organization_path, class: "nav-link #{'active' if current_page?(organization_path)}") do %> diff --git a/app/views/partners/show.html.erb b/app/views/partners/show.html.erb index 2477a7e687..81e12f03be 100644 --- a/app/views/partners/show.html.erb +++ b/app/views/partners/show.html.erb @@ -34,7 +34,7 @@

    Partner Actions

    • - <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %> <%= link_to partner_users_path(@partner) do %>
    Manage Users diff --git a/app/views/product_drives/show.html.erb b/app/views/product_drives/show.html.erb index 4153457f04..d67bf4a473 100644 --- a/app/views/product_drives/show.html.erb +++ b/app/views/product_drives/show.html.erb @@ -90,7 +90,7 @@

    <%= edit_button_to edit_product_drive_path(@product_drive), { text: "Make a correction", size: "md" } %> - <%= delete_button_to product_drive_path(@product_drive), { confirm: "Are you sure you want to permanently remove this product drive?", size: "md" } if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <%= delete_button_to product_drive_path(@product_drive), { confirm: "Are you sure you want to permanently remove this product drive?", size: "md" } if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
    diff --git a/app/views/purchases/show.html.erb b/app/views/purchases/show.html.erb index 9969b9153c..6d5ae8f3b8 100644 --- a/app/views/purchases/show.html.erb +++ b/app/views/purchases/show.html.erb @@ -81,7 +81,7 @@ <%= edit_button_to edit_purchase_path(@purchase), { text: "Make a correction", enabled: !@purchase.has_inactive_item?, size: "md" } %> - <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> + <% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %> <%= delete_button_to purchase_path(@purchase), { size: "md", enabled: !@purchase.has_inactive_item?, diff --git a/app/views/users/_organization_user.html.erb b/app/views/users/_organization_user.html.erb index 0e29481d87..a467180850 100644 --- a/app/views/users/_organization_user.html.erb +++ b/app/views/users/_organization_user.html.erb @@ -16,7 +16,7 @@