thecore_ui_rails_admin 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 953f3462757f91a3434f925f7d49f39b222a3121ec19023cf820d4e7de446834
-  data.tar.gz: f889522a830f2a8ef4b1a546c7b7b1bbc734e1480acbd1744240c3d979686220
+  metadata.gz: c92dfa0ea94b25f9ddbe39304a0c10fdb716c6d4ef271353f4c84c293b1d2d6b
+  data.tar.gz: 0d159f770d6078ca44c6a87c479ac9a4f5e991827cf3c720f2241b4685c558ac
 SHA512:
-  metadata.gz: e49d5bf6d19e4a6031602cf33f03f51eb8ada43b53861383a8d05bc82ba54232e4663d73a5c51460c5e44821ce62c94f90e38891166b80c96c253bd830cf04ec
-  data.tar.gz: 5ac31d81add4e6dc88175b725ea15c5b110e4f1693aded0790df0024b5f2a4ed18f474ec3faabdc7b3b0f8cf9c3c428be8ba817805ade646be57b1854e8390de
+  metadata.gz: 0b2f5b78a265e357b2d0f5a5a114e3880e9ec49fb8ee3ee89b83c43b49395722dfe022a7bfe600282624cc1bd209eef1a4330720729144da4a8f4728388d9d47
+  data.tar.gz: '095446452ed01a2ae2ade63d087ef86fa826fb9fcab71cd18f5cbe09ce4e0bdc2d8dcbd74817e4aa2509e2ecac8607f17c4d61f2b012c953db946e50308cb1c1'

data/config/initializers/thecore_ui_rails_admin_after_initialize.rb

@@ -47,7 +47,9 @@ Rails.application.configure do
                 end
             end
         end
+
         # include the extension
+        ApplicationController.send(:include, ThecoreUiRailsAdminActionControllerConcern)
         RailsAdmin::Config::Actions::Export.send(:include, ExportConcern)
         RailsAdmin::Config::Actions::BulkDelete.send(:include, BulkDeleteConcern)
         Role.send :include, ThecoreUiRailsAdminRoleConcern

data/config/initializers/{thecore_ui_rails_admin_concern.rb → thecore_ui_rails_admin_application_controller_concern.rb}

@@ -1,6 +1,6 @@
 require 'active_support/concern'
 
-module ThecoreUiRailsAdminConcern
+module ThecoreUiRailsAdminActionControllerConcern
   extend ActiveSupport::Concern
   
   included do
@@ -26,13 +26,13 @@ module ThecoreUiRailsAdminConcern
     # Redirects on successful sign in
     def after_sign_in_path_for resource
       root_actions = RailsAdmin::Config::Actions.all(:root).select {|action| can? action.action_name, :all }.collect(&:action_name)
-
+      
       # Default root action as landing page: the first to which I have authorization to read
       action = root_actions.first
       # Otherwise, if I set a Manual override for landing actions in config, I can test if I'm authorized to see it
       override_landing_page = Settings.ns(:main).after_sign_in_redirect_to_root_action
       action = override_landing_page.to_sym if !override_landing_page.blank? && root_actions.include?(override_landing_page.to_sym)
-
+      
       # If I ask for a specific page, Let's try to go back there if I need to login or re-login
       # This takes precedence on automatic computed action
       stored_location = stored_location_for(resource)
@@ -100,54 +100,50 @@ module ThecoreUiRailsAdminConcern
         :password_confirmation,
         :current_password)
       }
-    end
-    
-    # Auto-sign out locked users
-    def reject_locked!
-      # Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB reject_locked"
-      if !current_user.blank? && current_user.locked?
-        # Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is locked"
-        sign_out current_user
-        user_session = nil
-        current_user = nil
-        flash[:alert] = "Your account is locked."
-        flash[:notice] = nil
-        redirect_to root_url
-      end
-      # Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is not locked = ok"
-    end
-
-    
-    # Only permits admin users
-    def require_admin!
-      authenticate_user!
-      
-      if current_user && !current_user.admin?
-        redirect_to inside_path
-      end
-    end
+  end
     
-    # Its important that the location is NOT stored if:
-    # - The request method is not GET (non idempotent)
-    # - The request is handled by a Devise controller such as 
-    #     Devise::SessionsController as that could cause an 
-    #     infinite redirect loop.
-    # - The request is an Ajax request as this can lead to very unexpected 
-    #     behaviour.
-    def storable_location?
-      request.get? && is_navigational_format? && !devise_controller? && !request.xhr? && is_storable?
+  # Auto-sign out locked users
+  def reject_locked!
+    # Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB reject_locked"
+    if !current_user.blank? && current_user.locked?
+      # Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is locked"
+      sign_out current_user
+      user_session = nil
+      current_user = nil
+      flash[:alert] = "Your account is locked."
+      flash[:notice] = nil
+      redirect_to root_url
     end
+    # Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is not locked = ok"
+  end
+  
+  
+  # Only permits admin users
+  def require_admin!
+    authenticate_user!
     
-    def store_user_location!
-      # :user is the scope we are authenticating
-      store_location_for(:user, request.fullpath)
-    end
-
-    def is_storable?
-      true
+    if current_user && !current_user.admin?
+      redirect_to inside_path
     end
   end
   
-  # include the extension
-  ActionController::Base.send(:include, ThecoreUiRailsAdminConcern)
-  
+  # Its important that the location is NOT stored if:
+  # - The request method is not GET (non idempotent)
+  # - The request is handled by a Devise controller such as 
+  #     Devise::SessionsController as that could cause an 
+  #     infinite redirect loop.
+  # - The request is an Ajax request as this can lead to very unexpected 
+  #     behaviour.
+  def storable_location?
+    request.get? && is_navigational_format? && !devise_controller? && !request.xhr? && is_storable?
+  end
+  
+  def store_user_location!
+    # :user is the scope we are authenticating
+    store_location_for(:user, request.fullpath)
+  end
+  
+  def is_storable?
+    true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_rails_admin
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Gabriele Tassoni
@@ -111,8 +111,8 @@ files:
 - config/initializers/thecore_ui_rails_admin_abilities.rb
 - config/initializers/thecore_ui_rails_admin_after_initialize.rb
 - config/initializers/thecore_ui_rails_admin_app_configs.rb
+- config/initializers/thecore_ui_rails_admin_application_controller_concern.rb
 - config/initializers/thecore_ui_rails_admin_assets.rb
-- config/initializers/thecore_ui_rails_admin_concern.rb
 - config/initializers/thecore_ui_rails_admin_invisible_models_concern.rb
 - config/initializers/thecore_ui_rails_admin_role.rb
 - config/initializers/thecore_ui_rails_admin_settings_concern.rb