thecore_ui_rails_admin 2.3.6 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cc15c20ab978e80e9d0c78e36c2d1e64ef48eb2d0aa9b4fbbe948aa25effb90
-  data.tar.gz: 198eb37822d6eee65c7494715be0000839b9d2e9576f86e82537981425979b0e
+  metadata.gz: 1279d70dc26563abf8d3f1df0f0e42e9914517904e3ba6fe15a9767ef3e1ec39
+  data.tar.gz: 713d6d14978afe9a9c5bbcf1340c0f37124dc03ea3f982526129b89bb207fe79
 SHA512:
-  metadata.gz: 8a7afd0470597fd0ef7ea9df01aad0a3a020a3c27a7ba8dbb06aaf98f97bab047ffb30f6cbe17d4179252e344bcfdebc06bb0a8575d9edf74bd2ed3397c0f7b8
-  data.tar.gz: 3a76924fee0bfc088909731751e757ac1b4cae436bb258ed2e218cdab5e85a6a07f74e046c602a25a0fe173e581de50a0baecc98997ce8974bc81b9c810f4453
+  metadata.gz: 9deccd904b0c45249cf22d6f3857f579011600472e1a0de3eff8ce3bb3364c6a4ffbc87b12cef0c941531ecf77f055499f8f19650f1ec5f0adbb3f44d8b6419f
+  data.tar.gz: b627897bceb05749e8b7a775ff4094f5931f29b32c7192c5b6211f883f9bc04817e78662b5724abef059d963e3aebe7c6e1225ce450a58e094f5129aff52b887

data/app/assets/javascripts/thecore_ui_rails_admin/thecore_rails_admin.js

@@ -1,5 +1,4 @@
 //= require thecore_ui_commons/thecore
-//= require rails_admin/rails_admin
 //= require selectize
 
 $(document).on('ready pjax:success', function(e) {

data/app/assets/stylesheets/thecore_ui_rails_admin/thecore_rails_admin.scss

@@ -138,9 +138,9 @@ body.rails_admin .nav.nav-tabs {
 .content {
   margin: 0px 0 15px 0;
   padding: 8px;
-  background: $background;
+  background: transparent;
   &.dashboard {
-    background: $background;
+    background: transparent;
   }
   .page-header {
     display: none;

data/app/views/layouts/rails_admin/application.html.haml

@@ -23,8 +23,8 @@
   %body.rails_admin
     #admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
     -# Initialize JS simple i18n
-    :javascript
-      RailsAdmin.I18n.init('#{I18n.locale}', document.getElementById("admin-js").dataset.i18nOptions);
+    -# :javascript
+    -#   RailsAdmin.I18n.init('#{I18n.locale}', document.getElementById("admin-js").dataset.i18nOptions);
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
     -# %nav.navbar.navbar-default.navbar-fixed-top
     -#   = render "layouts/rails_admin/navigation"

data/config/initializers/thecore_concern.rb

@@ -9,7 +9,7 @@ module ThecoreConcern
     layout 'thecore'
     protect_from_forgery with: :exception, prepend: true
     rescue_from CanCan::AccessDenied do |exception|
-      redirect_to main_app.root_url, :alert => exception.message
+      redirect_to main_app.root_url, alert: exception.message
     end
     include HttpAcceptLanguage::AutoLocale
     before_action :store_user_location!, if: :storable_location?
@@ -33,17 +33,22 @@ module ThecoreConcern
       action = root_actions.collect(&:action_name).first
       # REDIRECT TO THAT ACTION
 
-      if stored_location_for(resource) && can?(resource, :all)
-        return stored_location_for(resource)
+      Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path"
+      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}"
+        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
         flash[:alert] = "Your user is not authorized to access any page."
         flash[:notice] = nil
-        return root_url
+        return root_path
       end
     end
   end
@@ -100,7 +105,9 @@ module ThecoreConcern
     
     # Auto-sign out locked users
     def reject_locked!
-      if current_user && current_user.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
@@ -108,7 +115,9 @@ module ThecoreConcern
         flash[:notice] = nil
         redirect_to root_url
       end
+      Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is not locked = ok"
     end
+
     
     # Only permits admin users
     def require_admin!

data/lib/thecore_ui_rails_admin.rb

@@ -11,7 +11,7 @@ require 'concerns/rails_admin_requirements'
 # Abilities
 require 'abilities/thecore_ui_rails_admin'
 # Rails Admin Buildups
-require 'jquery-ui-rails'
+# require 'jquery-ui-rails'
 require 'bootstrap-sass'
 
 require 'concerns/thecore_ui_rails_admin_user'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_rails_admin
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.4.2
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_ui_commons
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 description: Holds all base dependencies and configurations to have a thecore integrated
   with Rails Admin.
 email: