From 79c1532742a72467c5b8631a1b8e21bb5f5e1ff5 Mon Sep 17 00:00:00 2001 From: Karol Date: Thu, 26 Nov 2020 17:20:28 +0100 Subject: [PATCH] clean up rails_admin configuration --- app/policies/application_policy.rb | 3 --- config/initializers/rails_admin.rb | 9 ++++----- config/routes.rb | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb index f92d7fcc..28f33b7c 100644 --- a/app/policies/application_policy.rb +++ b/app/policies/application_policy.rb @@ -76,7 +76,4 @@ class ApplicationPolicy end private :require_user! end - [:dashboard?, :index?, :new?, :export?, :bulk_delete?, :show?, :edit?, :delete?, :show_in_app?,].each do |action| - define_method(action) { admin? } - end end diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb index ccef6bdc..517ce072 100644 --- a/config/initializers/rails_admin.rb +++ b/config/initializers/rails_admin.rb @@ -14,11 +14,10 @@ RailsAdmin.config do |config| ## == Pundit == # config.authorize_with :pundit config.authorize_with do - redirect_to main_app.root_path unless current_user.admin? - # unless current_user.admin? - # flash[:alert] = 'Access denied.' - # redirect_to main_app.root_path - # end + unless current_user&.admin? + flash[:alert] = 'Access denied.' + redirect_to main_app.root_path + end end ## == PaperTrail == diff --git a/config/routes.rb b/config/routes.rb index 2e00d9f4..4186e746 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,6 @@ FILENAME_REGEXP = /[\w\.]+/ unless Kernel.const_defined?(:FILENAME_REGEXP) Rails.application.routes.draw do - mount RailsAdmin::Engine => '/rails_admin', as: 'rails_admin' resources :error_template_attributes resources :error_templates do member do @@ -161,4 +160,5 @@ Rails.application.routes.draw do post "/submit", to: 'remote_evaluation#submit', via: [:post] mount ActionCable.server => '/cable' + mount RailsAdmin::Engine => '/rails_admin', as: 'rails_admin' end