thecore_ui_rails_admin 2.3.2 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21fde51d33d465f84313ae56c053c3a29d1150602fdd070dfb1879798b776747
-  data.tar.gz: 49b7e7fd4e644eb0800b68f80ede6bbb2aa26bf6dc9fd444abe4312a9f19a11e
+  metadata.gz: 4e463c54522828d09b59b3851ea86893698b0d25b14bc0b45aeab27ef5709d79
+  data.tar.gz: 91e1a2d6ff4d0054d60ba54e6d27bcfa471c1d219c3cd7c4fc65c491cb3c3375
 SHA512:
-  metadata.gz: c859caeda5832694b057a29d9733169c071ae96b521965e3953eae6081aa88c8e6ff35a5149e57aea1d2191a526aba214c93b6bbe4e1ae5303b902c9be24446a
-  data.tar.gz: 82600ed9c2565484ec9a571773ec9c43b121048c6f8d69666bfadb630d3b6693d45340bf15ded31e530433c56370651a72a5a966aa607b2b373f3a0743c03d4b
+  metadata.gz: 980980371869c46e9e2fb547af383f78f3d97bfd6c7aee47c768960478b7e4e8d5e7aef9dd595c0c4de4e2be2cf8353b010afdde573c2d2782753d1a564681e2
+  data.tar.gz: 10e802da71db82d2139bcf4796d8413dd50523d24bba7bdbf5d2a717696b4326cc78e1debdfa145534d7a869f874b712df5315c953099dec4338a8511808e004

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

@@ -0,0 +1,4 @@
+%style{media: "screen"}
+    div#sidebar-wrapper div.sidebar-nav li.dropdown-header {padding-left: 0px}
+    div.sub-menu-container li.sub-menu a.pjax {padding-left: 0px}
+    div#wrapper div#sidebar-wrapper {overflow: hidden}

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

@@ -0,0 +1 @@
+-# Placeholder to be overridden for special CSS needs, like using interpolation

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

@@ -7,11 +7,9 @@
     %meta{name: "viewport", content: "width=device-width, initial-scale=1"}
     %meta{content: "NONE,NOARCHIVE", name: "robots"}
     = csrf_meta_tag
-    %style{media: "screen"}
-      div#sidebar-wrapper div.sidebar-nav li.dropdown-header { padding-left: 0px }
-      div.sub-menu-container li.sub-menu a.pjax { padding-left: 0px }
-      div#wrapper div#sidebar-wrapper { overflow: hidden }
 
+    = 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'

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

@@ -17,8 +17,10 @@
   = breadcrumb
   .well.well-sm
     %ul.nav.nav-pills#action-menu
-      = menu_for((@abstract_model ? (@object.try(:persisted?) ? :member : :collection) : :root), @abstract_model, @object)
+      = content_for :search_form
+      = content_for :action_links
       = content_for :contextual_tabs
+
   .well.well-sm
     = yield
 - else

data/app/views/rails_admin/main/_dashboard_block.html.haml

@@ -0,0 +1,9 @@
+- @abstract_models.each do |abstract_model|
+    - index_path = index_path(model_name: abstract_model.to_param)
+    - if authorized?(:index, abstract_model)
+        .col-sm-4
+            %a.box.pjax{href: index_path}
+                %i{class: "icon-bg #{abstract_model.config.navigation_icon.present? ? abstract_model.config.navigation_icon : 'file' }"}
+                .text-center
+                    %p.model= capitalize_first_letter(abstract_model.config.label_plural)
+                    %strong.count= @count[abstract_model.model.name].to_s

data/app/views/rails_admin/main/dashboard.html.haml

@@ -19,15 +19,7 @@
 
 - if @abstract_models
   .row
-    - @abstract_models.each do |abstract_model|
-      - index_path = index_path(model_name: abstract_model.to_param)
-      - if authorized?(:index, abstract_model)
-        .col-sm-4
-          %a.box.pjax{href: index_path}
-            %i{class: "icon-bg #{abstract_model.config.navigation_icon.present? ? abstract_model.config.navigation_icon : 'file' }"}
-            .text-center
-              %p.model= capitalize_first_letter(abstract_model.config.label_plural)
-              %strong.count= @count[abstract_model.model.name].to_s
+    = render partial: 'rails_admin/main/dashboard_block'
 
 - if @auditing_adapter && authorized?(:history_index)
   #block-tables.block

data/app/views/rails_admin/main/index.html.haml

@@ -8,6 +8,7 @@
   params.delete(:sort) if params[:sort] == @model_config.list.sort_by.to_s
   export_action = RailsAdmin::Config::Actions.find(:export, { controller: self.controller, abstract_model: @abstract_model })
   export_action = nil unless export_action && authorized?(export_action.authorization_key, @abstract_model)
+  bulk_delete_action = actions(:bulkable, @abstract_model).select { |action| action.action_name.to_s == "bulk_delete" }.first
   description = RailsAdmin.config(@abstract_model.model_name).description
   properties = @model_config.list.with(controller: self.controller, view: self, object: @abstract_model.model.new).visible_fields
   checkboxes = @model_config.list.checkboxes?
@@ -19,23 +20,55 @@
     other_right = sets[params[:set].to_i + 1].present?
   end
 
+- content_for :action_links do
+  - parent = (@abstract_model ? (@object.try(:persisted?) ? :member : :collection) : :root)
+  - actions = actions(parent, @abstract_model, @object).select { |a| a.http_methods.include?(:get) && a.show_in_menu && a.action_name.to_s != "export"}
+  - actions.collect do |action|
+    - wording = wording_for(:link, action)
+    %li{title: wording, rel: "tooltip", class: "icon #{action.key}_#{parent}_link #{'active' if current_action?(action)}", style: "float:right"}
+      %a{class: "#{action.pjax? ? 'pjax' : ''}", href: rails_admin.url_for(action: action.action_name, controller: 'rails_admin/main', model_name: @abstract_model.try(:to_param), id: (@object.try(:persisted?) && @object.try(:id) || nil))}
+        %i{class: action.link_icon}
+
+- content_for :search_form do
+  %li.filer-search-form
+    = form_tag(index_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do
+      %span#filters_box{data: {options: ordered_filter_options.to_json}}
+      %hr.filters_box{style: "display:#{ordered_filters.blank? ? 'none' : 'block'}"}
+      .input-group#search-for-filter
+        %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
+        %span.input-group-btn
+          %button.btn.btn-primary{type: 'submit', :'data-disable-with' => '<i class="icon-white icon-refresh"></i> '.html_safe + t('admin.misc.refresh')}
+            %i.icon-white.icon-refresh
+          - if filterable_fields.present?
+            %button.btn.dropdown-toggle#filters-menu{ :'data-toggle' => "dropdown", :'aria-haspopup'=>"true", :'aria-expanded'=>"true"}
+              %i.icon-white.icon-filter
+              %b.caret
+            %ul.dropdown-menu#filters{style: 'left:auto; right:0;', :'aria-labelledby'=>"filters-menu"}
+              - filterable_fields.each do |field|
+                - field_options = case field.type
+                - when :enum
+                  - options_for_select(field.with(object: @abstract_model.model.new).enum)
+                - else
+                  - ''
+                %li
+                  %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => (field.try(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
+            %button#remove_filter.btn.btn-info{title: "Reset filters"}
+              %i.icon-white.icon-remove
+
 - content_for :contextual_tabs do
-  - if checkboxes
-    = bulk_menu
-  - if filterable_fields.present?
-    %li.dropdown{style: 'float:right'}
-      %a.dropdown-toggle#filters-menu{ :'data-toggle' => "dropdown", :'aria-haspopup'=>"true", :'aria-expanded'=>"true"}
-        = t('admin.misc.add_filter')
+  - if checkboxes && bulk_delete_action
+    %li.icon{style: "float:right", title: t(:delete_selected)}
+      = link_to '<i class="fa fa-trash"></i>'.html_safe, '#', class: 'bulk-link', data: {action: "bulk_delete"}
+  - if export_action
+    %li.dropdown{style: "float:right", title: t(:export)}
+      %a.pjax.dropdown-toggle#exporters-menu{ :'data-toggle' => "dropdown", :'aria-haspopup'=>"true", :'aria-expanded'=>"true", style: "float: right;"}
+        %i.fa.fa-external-link
         %b.caret
-      %ul.dropdown-menu#filters{style: 'left:auto; right:0;', :'aria-labelledby'=>"filters-menu"}
-        - filterable_fields.each do |field|
-          - field_options = case field.type
-          - when :enum
-            - options_for_select(field.with(object: @abstract_model.model.new).enum)
-          - else
-            - ''
-          %li
-            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => (field.try(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
+      %ul.dropdown-menu#exporters{style: 'left:auto; right:0;', :'aria-labelledby'=>"exporters-menu"}
+        %li= link_to t(:export_all).html_safe, rails_admin.url_for(action: "export", controller: 'rails_admin/main', model_name: @abstract_model.try(:to_param), id: (@object.try(:persisted?) && @object.try(:id) || nil)), class: "pjax"
+        %li= link_to t(:export_found).html_safe, export_path(params.except('set').except('page')), class: 'pjax'
+        %li= link_to t(:export_selected).html_safe, '#', class: 'bulk-link pjax', data: {action: "bulk_export"}
+
 
 %style
   - properties.select{ |p| p.column_width.present? }.each do |property|
@@ -43,20 +76,6 @@
     = "#list td.#{property.css_class} { max-width: #{property.column_width}px; }"
 
 #list
-  = form_tag(index_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do
-    %span#filters_box{data: {options: ordered_filter_options.to_json}}
-    %hr.filters_box{style: "display:#{ordered_filters.blank? ? 'none' : 'block'}"}
-    .input-group
-      %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
-      %span.input-group-btn
-        %button.btn.btn-primary{type: 'submit', :'data-disable-with' => '<i class="icon-white icon-refresh"></i> '.html_safe + t('admin.misc.refresh')}
-          %i.icon-white.icon-refresh
-          = t('admin.misc.refresh')
-        %button#remove_filter.btn.btn-info{title: "Reset filters"}
-          %i.icon-white.icon-remove
-    - if export_action
-      %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'
-
   - unless @model_config.list.scopes.blank?
     %ul.nav.nav-tabs.nav-justified#scope_selector
       - @model_config.list.scopes.each do |scope|

data/config/initializers/thecore_concern.rb

@@ -31,9 +31,24 @@ module ThecoreConcern
       # Rails.logger.debug "ROOT ACTIONS: #{root_actions.inspect}"
       # GETTING THE FIRST ACTION I CAN MANAGE
       action = root_actions.collect(&:action_name).first
-      # Rails.logger.debug "FIRST ACTION: #{action}"
       # REDIRECT TO THAT ACTION
-      stored_location_for(resource) || rails_admin.send("#{action}_path").sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
+
+      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)
+      elsif action
+        puts "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}"
+        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_path
+      end
     end
   end
   

data/config/locales/it.main.yml

@@ -1,10 +1,24 @@
 it:
+  export: Esporta
+  export_all: Esporta Tutti
+  export_found: Esporta i Filtrati
+  export_selected: Esporta i Selezionati
+  delete_selected: Elimina i Selezionati
   yes: Si
   no: Annulla
   error: Errore
   question: Domanda
   root_actions: "Operazioni"
   admin:
+    flash:
+      error: "Impossibile eseguire l'azione %{action} (%{name})"
+      model_not_found: Impossibile trovare il modello '%{model}'
+      noaction: Impossibile eseguire l'azione
+      object_not_found: "Impossibile trovare il modello %{model} con id '%{id}'"
+      successful: "Azione eseguita con successo: %{action} (%{name})"
+    actions:
+      index:
+        link: Mostra tutti gli Elementi
     label: "Impostazioni"
     advanced:
       label: Avanzate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_rails_admin
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.7
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_ui_commons
@@ -180,10 +180,13 @@ files:
 - 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