thecore_ui_rails_admin 2.5.6 → 2.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dbbb4fc0003479cf43ec5f3744e176f8105193f45d232c9cde53e54fa4d3f85
-  data.tar.gz: 3c8f44879ee7f337f0db4695edbdce186ac63553156f0b813878af6ef27c5834
+  metadata.gz: 436b2fd4b12a451fa58e3bc437e00496889f94e65bcf848e20421fcb574d87b3
+  data.tar.gz: ddc400dcdc47f218eb6580eaf46ee4675a0e2fa6abca4c9106e0a8df1508cbae
 SHA512:
-  metadata.gz: 448cef53ac6f81b5671a948f5c5a6c9bd89365067708e1501b489100f380a986e7c2a2d28ab409a04b6d81747fe4cbeae01b529f4229e3a22d8902b41e5047fb
-  data.tar.gz: bec954a41ad1dd8dfbf570a0c8de939e30ad0c0b590fc714582026ee1ccfb309cb489f6874a7e8ea620516c7c71d8be475f45211a848d977a65ad82c5569a6af
+  metadata.gz: b84789f3dd2c7ae33194df07f61d505ca746654cb9319d4bbc2c4d11f33739821402a54ee214cb5780dd82e590b7ef6ec11edde1f37232b40beed9dda8bc9263
+  data.tar.gz: 973c3192ffb95474ccabccd89c183d6312c31f74a907aab56727596fe9a14e8b12bbfd167e40df46f9d8485bc448b694223ef80aeef03cedb2dd25980dec3d98

data/config/initializers/thecore_concern.rb

@@ -24,25 +24,23 @@ module ThecoreConcern
     
     # Redirects on successful sign in
     def after_sign_in_path_for resource
-      # Rails.logger.debug("SUCCESFULL SIGNIN, USER IS ADMIN? #{current_user.admin?}")
-      #if current_user.admin?
-      # GETTING JUST THE ROOT ACTIONS I (CURRENT_USER) CAN MANAGE
-      root_actions = RailsAdmin::Config::Actions.all(:root).select {|action| can? action.action_name, :all }
-      # Rails.logger.debug "ROOT ACTIONS: #{root_actions.inspect}"
-      # GETTING THE FIRST ACTION I CAN MANAGE
-      action = root_actions.collect(&:action_name).first
-      # REDIRECT TO THAT ACTION
+      root_actions = RailsAdmin::Config::Actions.all(:root).select {|action| can? action.action_name, :all }.collect(&:action_name)
 
-      # Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path"
+      # 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)
       if !stored_location.blank? && can?(resource, :all)
-        # Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the IF stored_location_for(resource): #{stored_location}"
+        # Go to the latest navigated page
         return stored_location
       elsif action
-        # Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSIF with action name: #{action}"
         return rails_admin.send("#{action}_path").sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
       else
-        # Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSE with root_path: #{root_path}"
         sign_out current_user
         user_session = nil
         current_user = nil
@@ -136,13 +134,17 @@ module ThecoreConcern
     # - 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? 
+      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
   
   # include the extension

data/db/seeds.rb

@@ -0,0 +1 @@
+Thecore::Seed.save_setting :main, :after_sign_in_redirect_to_root_action, ""

data/lib/concerns/thecore_ui_rails_admin_permission.rb

@@ -9,24 +9,25 @@ module ThecoreUiRailsAdminPermission
             field :predicate
             field :action
             field :target
+            field :lock_version
             list do
                 field :created_at
-                exclude_fields :lock_version
+                # exclude_fields :lock_version
             end
             show do
                 exclude_fields :id
-                exclude_fields :lock_version
-            end
-            create do
-                field :lock_version, :hidden do
-                    visible true
-                end
-            end
-            edit do
-                field :lock_version, :hidden do
-                    visible true
-                end
+                # exclude_fields :lock_version
             end
+            # create do
+            #     field :lock_version, :hidden do
+            #         visible true
+            #     end
+            # end
+            # edit do
+            #     field :lock_version, :hidden do
+            #         visible true
+            #     end
+            # end
         end
     end
 end

data/lib/concerns/thecore_ui_rails_admin_role.rb

@@ -12,25 +12,26 @@ module ThecoreUiRailsAdminRole
             
             field :name
             field :permissions#, :selectize
+
             list do
                 field :created_at
-                exclude_fields :lock_version
+                # exclude_fields :lock_version
             end
             show do
                 exclude_fields :id
-                exclude_fields :lock_version
-            end
-            create do
-                field :lock_version, :hidden do
-                    visible true
-                end
-                # include UserRailsAdminCreateConcern
-            end
-            edit do
-                field :lock_version, :hidden do
-                    visible true
-                end
+                # exclude_fields :lock_version
             end
+            # create do
+            #     field :lock_version, :hidden do
+            #         visible true
+            #     end
+            #     # include UserRailsAdminCreateConcern
+            # end
+            # edit do
+            #     field :lock_version, :hidden do
+            #         visible true
+            #     end
+            # end
         end
     end
 end

data/lib/concerns/thecore_ui_rails_admin_user.rb

@@ -61,9 +61,9 @@ module ThecoreUiRailsAdminUser
                 field :password_confirmation do
                     required true
                 end
-                field :lock_version, :hidden do
-                    visible true
-                end
+                # field :lock_version, :hidden do
+                #     visible true
+                # end
                 # include UserRailsAdminCreateConcern
             end
             edit do
@@ -74,9 +74,9 @@ module ThecoreUiRailsAdminUser
                     required false
                 end
                 
-                field :lock_version, :hidden do
-                    visible true
-                end
+                # field :lock_version, :hidden do
+                #     visible true
+                # end
                 # include UserRailsAdminEditConcern
                 
             end

data/lib/thecore_ui_rails_admin/engine.rb

@@ -1,6 +1,7 @@
 module ThecoreUiRailsAdmin
   class Engine < ::Rails::Engine
     initializer 'thecore_ui_rails_admin.add_to_migrations' do |app|
+      Thecore::Base.thecore_engines << self.class
       unless app.root.to_s.match root.to_s
         # APPEND TO MAIN APP MIGRATIONS FROM THIS GEM
         config.paths['db/migrate'].expanded.each do |expanded_path|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_rails_admin
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.10
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_ui_commons
@@ -183,6 +183,7 @@ files:
 - config/locales/it.rails_admin.yml
 - config/locales/it.rollincode.yml
 - config/routes.rb
+- db/seeds.rb
 - lib/abilities/thecore_ui_rails_admin.rb
 - lib/concerns/rails_admin_requirements.rb
 - lib/concerns/thecore_rails_admin_bulk_delete_concern.rb