thecore_ui_rails_admin 2.3.7 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e463c54522828d09b59b3851ea86893698b0d25b14bc0b45aeab27ef5709d79
-  data.tar.gz: 91e1a2d6ff4d0054d60ba54e6d27bcfa471c1d219c3cd7c4fc65c491cb3c3375
+  metadata.gz: f742f063e5493a754e1ed5986469072828eab6b56e4010f47a590b14e53788ea
+  data.tar.gz: d294bf1efcc345e73c919d77e2f41683f5b84740516d216e50f04e544a2d5258
 SHA512:
-  metadata.gz: 980980371869c46e9e2fb547af383f78f3d97bfd6c7aee47c768960478b7e4e8d5e7aef9dd595c0c4de4e2be2cf8353b010afdde573c2d2782753d1a564681e2
-  data.tar.gz: 10e802da71db82d2139bcf4796d8413dd50523d24bba7bdbf5d2a717696b4326cc78e1debdfa145534d7a869f874b712df5315c953099dec4338a8511808e004
+  metadata.gz: 5b2fe54852594f3896777869d9cd17df703b82d143c3f0351f72a67e2848fe6aff35c4156c3c09d1576e91bbe341ad72c3c3e2b1565138db090eda7aab0044b3
+  data.tar.gz: f185205ca2a05e139d8e5b8d4ccb0f22361ac2feb22f4f02000c54bb3b2be57c54cb3034e45da2511e31ac1571602df843c7c0ad0e5ed92a2ade43b1d421eee7

data/app/assets/javascripts/rails_admin/custom/ui.js

@@ -0,0 +1 @@
+//= require selectize

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/rails_admin/custom/theming.scss

@@ -0,0 +1,6 @@
+@import 'selectize';
+@import 'selectize.bootstrap3';
+
+.form-control.selectize-control {
+    width: 62%;
+}

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 → layouts.old}/rails_admin/application.html.haml

@@ -2,17 +2,15 @@
 %html{lang: I18n.locale}
   %head
     %title= Settings.app_name rescue "Thecore"
-    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
-    %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
-    %meta{name: "viewport", content: "width=device-width, initial-scale=1"}
-    %meta{content: "NONE,NOARCHIVE", name: "robots"}
-    = csrf_meta_tag
+
+    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => 'reload'
+    = javascript_pack_tag 'application', 'data-turbolinks-track' => 'reload'
+
+    = render "layouts/rails_admin/head"
 
     = render "layouts/rails_admin/style_common"
     = render "layouts/rails_admin/style_override"
 
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => 'reload'
-    = javascript_pack_tag 'application', 'data-turbolinks-track' => 'reload'
     / Getting all the assets needed by thecore_ui_rails_admin from all the gems and the application level
     = get_asset_tags_for("thecore_rails_admin")
 
@@ -23,8 +21,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/app/views/{layouts → layouts.old}/rails_admin/pjax.html.haml

@@ -3,7 +3,7 @@
   $('.nav.nav-pills li[data-model="#{@abstract_model.to_param}"]').addClass('active');
   $(window).off('keydown');
 
-- # Integration of the rails_admin_settings gem, if not available, it rescues to the normal naming
+- # Integration of the thecore_settings gem, if not available, it rescues to the normal naming
 %title= "#{(@abstract_model.try(:pretty_name) || @page_name)} | #{Settings.app_name rescue ([_get_plugin_name[0] || 'Rails', _get_plugin_name[1] || 'Admin'].join(' '))}"
 .page-header
   %h1= @page_name

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,15 +33,16 @@ module ThecoreConcern
       action = root_actions.collect(&:action_name).first
       # REDIRECT TO THAT ACTION
 
-      puts "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path"
-      if stored_location_for(resource) && can?(resource, :all)
-        puts "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the IF"
-        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
-        puts "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSIF with action name: #{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
-        puts "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSE with root_path: #{root_path}"
+        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
@@ -104,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
@@ -112,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/config/initializers/thecore_ui_rails_admin_app_configs.rb

@@ -9,7 +9,7 @@ Rails.application.configure do
     config.after_initialize do
         RailsAdmin::Config::Actions::Export.send(:include, ExportConcern)
         RailsAdmin::Config::Actions::BulkDelete.send(:include, BulkDeleteConcern)
-        RailsAdminSettings::Setting.send(:include, RailsAdminSettings::RailsAdminExtensionConfig)
+        ThecoreSettings::Setting.send(:include, ThecoreSettings::RailsAdminExtensionConfig)
         User.send(:include, ThecoreUiRailsAdminUser)
         UsedToken.send(:include, ThecoreUiRailsAdminUsedToken)
         Role.send(:include, ThecoreUiRailsAdminRole)

data/lib/abilities/thecore_ui_rails_admin.rb

@@ -4,9 +4,9 @@ module Abilities
         def initialize user
             # No one is allowed to add or destroy settings
             # just list or edit existing
-            cannot :create, RailsAdminSettings::Setting
-            cannot :destroy, RailsAdminSettings::Setting
-            cannot :show, RailsAdminSettings::Setting
+            cannot :create, ThecoreSettings::Setting
+            cannot :destroy, ThecoreSettings::Setting
+            cannot :show, ThecoreSettings::Setting
         end
     end
 end

data/lib/concerns/rails_admin_requirements.rb

@@ -1,4 +1,4 @@
-module RailsAdminSettings
+module ThecoreSettings
   module RailsAdminExtensionConfig
     def self.included(base)
       # IMPORTANT: To extend rails admin section in model, directly, instead of using concerns, I can

data/lib/thecore_ui_rails_admin.rb

@@ -1,7 +1,7 @@
 require 'thecore_ui_commons'
 # Rails Admin
-ENV['RAILS_ADMIN_THEME'] ||= 'rollincode'
-require 'rails_admin_rollincode'
+# ENV['RAILS_ADMIN_THEME'] ||= 'rollincode'
+# require 'rails_admin_rollincode'
 require 'rails_admin'
 require 'rails_admin-i18n'
 require 'safe_yaml'
@@ -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.7
+  version: 2.4.3
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_ui_commons
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rails_admin_rollincode
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +122,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:
@@ -162,8 +134,10 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/thecore_ui_rails_admin_manifest.js
+- app/assets/javascripts/rails_admin/custom/ui.js
 - app/assets/javascripts/rails_admin/ra.widgets.coffee
 - app/assets/javascripts/thecore_ui_rails_admin/thecore_rails_admin.js
+- app/assets/stylesheets/rails_admin/custom/theming.scss
 - app/assets/stylesheets/thecore_ui_rails_admin/animate.css
 - app/assets/stylesheets/thecore_ui_rails_admin/apexcharts.scss
 - app/assets/stylesheets/thecore_ui_rails_admin/colors.scss
@@ -177,19 +151,19 @@ files:
 - app/controllers/pages_controller.rb
 - app/helpers/devise_bootstrap_errors_helper.rb
 - app/helpers/thecore_helper.rb
-- app/views/layouts/rails_admin/_navigation.html.haml
-- app/views/layouts/rails_admin/_secondary_navigation.html.haml
-- app/views/layouts/rails_admin/_sidebar_navigation.html.haml
-- app/views/layouts/rails_admin/_style_common.html.haml
-- app/views/layouts/rails_admin/_style_override.html.haml
-- app/views/layouts/rails_admin/_user_navigation.html.haml
-- app/views/layouts/rails_admin/application.html.haml
-- app/views/layouts/rails_admin/pjax.html.haml
-- app/views/rails_admin/main/_card.html.haml
-- app/views/rails_admin/main/_dashboard_block.html.haml
-- app/views/rails_admin/main/_modal_interaction.html.erb
-- app/views/rails_admin/main/dashboard.html.haml
-- app/views/rails_admin/main/index.html.haml
+- app/views/layouts.old/rails_admin/_navigation.html.haml
+- app/views/layouts.old/rails_admin/_secondary_navigation.html.haml
+- app/views/layouts.old/rails_admin/_sidebar_navigation.html.haml
+- app/views/layouts.old/rails_admin/_style_common.html.haml
+- app/views/layouts.old/rails_admin/_style_override.html.haml
+- app/views/layouts.old/rails_admin/_user_navigation.html.haml
+- app/views/layouts.old/rails_admin/application.html.haml
+- app/views/layouts.old/rails_admin/pjax.html.haml
+- app/views/rails_admin.old/main/_card.html.haml
+- app/views/rails_admin.old/main/_dashboard_block.html.haml
+- app/views/rails_admin.old/main/_modal_interaction.html.erb
+- app/views/rails_admin.old/main/dashboard.html.haml
+- app/views/rails_admin.old/main/index.html.haml
 - app/views/shared/_flash.html.erb
 - config/initializers/rails_admin.rb
 - config/initializers/thecore_concern.rb
@@ -202,8 +176,6 @@ files:
 - config/locales/it.main.yml
 - config/locales/it.rails_admin.yml
 - config/locales/it.rollincode.yml
-- config/locales/thecore_settings.en.yml
-- config/locales/thecore_settings.it.yml
 - config/routes.rb
 - lib/abilities/thecore_ui_rails_admin.rb
 - lib/concerns/rails_admin_requirements.rb

data/config/locales/thecore_settings.en.yml

@@ -1,31 +0,0 @@
-en:
-  settings:
-    namespaces:
-      main: Main
-    names:
-      app_name: Application Name
-  admin:
-    settings:
-      label: Settings
-      phone_invalid: Invalid Telephone
-      phones_invalid: "Invalid Telephones: %{phones}"
-      email_invalid: Invalid Email
-      yaml_invalid: Invalid Email
-      color_invalid: Invalid Color
-  mongoid: &mongoid
-    models:
-      rails_admin_settings/setting: Configurations
-    attributes:
-      rails_admin_settings/setting:
-        c_at: Created
-        u_at: Modified
-        enabled: Enabled
-        ns: Group
-        name: Name
-        key: Key
-        raw: Value
-        type: Type
-        kind: Type
-        label: Label
-  activerecord:
-    <<: *mongoid

data/config/locales/thecore_settings.it.yml

@@ -1,31 +0,0 @@
-it:
-  settings:
-    namespaces:
-      main: Principale
-    names:
-      app_name: Nome dell'applicazione
-  admin:
-    settings:
-      label: 'Impostazioni'
-      phone_invalid: Telefono non valido
-      phones_invalid: "Telefono non valido: %{phones}"
-      email_invalid: Email non valida
-      yaml_invalid: YAML non valido
-      color_invalid: Colore non valido
-  mongoid: &mongoid
-    models:
-      rails_admin_settings/setting: Configurazioni
-    attributes:
-      rails_admin_settings/setting:
-        c_at: Creato
-        u_at: Modificato
-        enabled: Abilitato
-        ns: Gruppo
-        name: Nome
-        key: Chiave
-        raw: Valore
-        type: Tipo
-        kind: Tipo
-        label: Etichetta
-  activerecord:
-    <<: *mongoid