slash_admin 1.5.7 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 905087476b4fe1a2cefd7cba21a3214fcf4834cb4fed1f1c5ccf00570fb246af
-  data.tar.gz: 5d29e7eb6d2ee39960526c5a85f033b34aa7549c3b38e53db84d137778ac1993
+  metadata.gz: 3f37650357b94f30b5d5ec38a6727a2acd36ee415bdccc9677b88edeaee134d8
+  data.tar.gz: 175e7a5bdaff7f68148cce13ea8e4c11c079770a603f235e09f0e6bd98c82fa2
 SHA512:
-  metadata.gz: 0aafd6dfba8ff8d7a46059b7a37380d8ef8b16df1b5fa6b7659942259ea99f0114e2f6e855857a92b7f50b4cea5763c6aec1a7a6913cf5fbb763e7e8ed0ca801
-  data.tar.gz: 32ef3759aa3558806282585bc470fbbcaf9dacdc9677a6710d0b96554c87f208380ba45b6335b0a68f89937dd68e99df4bd5d600ffc910378d47f7452b5470e3
+  metadata.gz: 287c7ca4f35a1611e4e462ea510d6214146f25f1095508e449a4bc92dd4aa0a5187f7f722b4790f0dc543b2a59b0c9c7d518eb6458c08b7941aba4ec301f3de2
+  data.tar.gz: e95d407901935798cf5ce90b5b88d99c96abb2e739d4ac6e29583dbb0e7b8b863523f32bf38528407cda973c411df2b05661fe40e59c97377005b87eb96821f5

data/app/assets/stylesheets/slash_admin/application.scss

@@ -1493,3 +1493,13 @@ p[data-f-id="pbf"] {
     }
   }
 }
+
+.list-icon {
+  font-weight: 900;
+  display: flex;
+  align-items: center;
+}
+
+.menu-divider-below {
+  border-bottom: #e3e9fc 1px solid;
+}

data/app/controllers/slash_admin/models_controller.rb

@@ -11,7 +11,7 @@ module SlashAdmin
     before_action :handle_default_params
     before_action :handle_associations
 
-    helper_method :list_params, :export_params, :create_params, :update_params, :show_params, :nested_params, :should_add_translatable?, :translatable_params, :available_locales, :tooltips, :no_title
+    helper_method :list_params, :export_params, :create_params, :update_params, :show_params, :nested_params, :should_add_translatable?, :translatable_params, :available_locales, :tooltips, :no_title, :icons
 
     def index
       authorize! :index, @model_class
@@ -161,6 +161,10 @@ module SlashAdmin
       []
     end
 
+    def icons
+      {}
+    end
+
     def handle_has_one
       @has_one = {}
       Array.wrap(update_params + create_params).uniq.each do |p|
@@ -218,7 +222,7 @@ module SlashAdmin
 
         flash[:success] = t("slash_admin.controller.nestable.success")
 
-        redirect_to(main_app.polymorphic_url(["slash_admin", @model_class])) && return if params.key?(:submit_redirect)
+        redirect_to(main_app.polymorphic_url([:slash_admin, @model_class])) && return if params.key?(:submit_redirect)
         redirect_to main_app.polymorphic_url([:nestable, :slash_admin, @model_class])
       end
     end
@@ -346,9 +350,9 @@ module SlashAdmin
     end
 
     def handle_redirect_after_submit
-      path = main_app.edit_polymorphic_url(["slash_admin", @model])
-      path = main_app.polymorphic_url(["slash_admin", @model_class]) if params.key?(:submit_redirect)
-      path = main_app.new_polymorphic_url(["slash_admin", @model_class]) if params.key?(:submit_add)
+      path = main_app.edit_polymorphic_url([:slash_admin, @model])
+      path = main_app.polymorphic_url([:slash_admin, @model_class]) if params.key?(:submit_redirect)
+      path = main_app.new_polymorphic_url([:slash_admin, @model_class]) if params.key?(:submit_add)
 
       path
     end

data/app/views/slash_admin/base/_data_list.html.erb

@@ -101,15 +101,26 @@
               <% elsif @has_many_fields.include?(attr) %>
                 <td class="<%= attr.to_s.parameterize.underscore.downcase %>">
                   <button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modal-see-assoc-<%= attr.to_s %>-<%= m.id %>"
-                    data-toggle="tooltip" data-placement="top" title="<%= t("slash_admin.view.see_model", model: attr.to_s.pluralize) %>"
+                    data-toggle="tooltip" data-placement="top" title="<%= t("slash_admin.view.see_model_of", model: attr.to_s.pluralize, of: m.name) %>"
                   >
-                    <i class="fa fa-list"></i>
+                    <span class="list-icon">
+                      <i class="fas fa-ellipsis-v"></i>
+                      <% if icons.key? attr %>
+                        &nbsp;<%= raw icons[attr.to_sym] %>
+                      <% else %>
+                        &nbsp;<%= attr.to_s.first.upcase %>
+                      <% end %>
+                    </span>
                   </button>
                   <div class="modal fade" id="modal-see-assoc-<%= attr.to_s %>-<%= m.id %>" tabindex="-1" role="dialog" aria-labelledby="modal" aria-hidden="true">
                     <div class="modal-dialog" role="document">
                       <div class="modal-content">
                         <div class="modal-header">
-                          <h5 class="modal-title" id="exampleModalLabel"><%= t('slash_admin.view.associations') %>
+                          <h5 class="modal-title" id="exampleModalLabel">
+                            <% if icons.key? attr %>
+                              <%= raw icons[attr.to_sym] %>&nbsp;
+                            <% end %>
+                            <%= t("model.#{attr}") %>
                             <strong>(<%= m.send(attr).length %>)</strong></h5>
                           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>

data/app/views/slash_admin/shared/_menu.html.erb

@@ -22,11 +22,11 @@
             <div class="sub-menu">
               <table class="table-sm">
                 <tbody>
-                <% s[:sub_menu].each do |sub| %>
+                <% s[:sub_menu].each_with_index do |sub, idx| %>
                   <% if sub[:path].present? %>
-                    <tr class="clickable-row <%= request.fullpath == sub[:path] ? 'active' : '' %>"
-                        data-href="<%= sub[:path] %>"
-                        data-blank="<%= s[:blank].present? ? 'true' : 'false' %>">
+                    <tr class="clickable-row <%= request.fullpath == sub[:path] ? 'active' : '' %> <%= s.dig(:sub_menu, idx + 1, :layout) == 'divider' ? 'menu-divider-below' : '' %>"
+                      data-href="<%= sub[:path] %>"
+                      data-blank="<%= s[:blank].present? ? 'true' : 'false' %>">
                       <td>
                         <a href="<%= sub[:path] %>" class="<%= request.fullpath == sub[:path] ? 'active' : '' %>" target="<%= s[:blank].present? ? '_blank' : '_self' %>">
                           <% if sub[:icon] %>
@@ -41,8 +41,8 @@
                       </td>
                     </tr>
                   <% else %>
-                    <% if access_model?(sub) %>
-                      <tr class="clickable-row <%= controller.controller_name == sub[:model].name.split('::').last.tableize ? 'active' : '' %>"
+                    <% if access_model?(sub) && sub[:layout].blank? %>
+                      <tr class="clickable-row <%= controller.controller_name == sub[:model].name.split('::').last.tableize ? 'active' : '' %> <%= s.dig(:sub_menu, idx + 1, :layout) == 'divider' ? 'menu-divider-below' : '' %>"
                           data-href="<%= polymorphic_url([:slash_admin, sub[:model]]) %>"
                           data-blank="<%= s[:blank].present? ? 'true' : 'false' %>">
                         <td>

data/config/locales/en.yml

@@ -26,7 +26,7 @@ en:
       save: Save
       delete: Delete
       new: New
-      see_model: "View the %{model}"
+      see_model_of: "View the %{model} of %{of}"
       edit: "Edit: %{model_name}"
       show: "Show: %{model_name}"
       tools: Tools

data/config/locales/fr.yml

@@ -29,7 +29,7 @@ fr:
       edit: "Édition: %{model_name}"
       show: "Affichage: %{model_name}"
       see: Voir
-      see_model: "Voir les %{model}"
+      see_model_of: "Voir les %{model} de %{of}"
       tools: Outils
       order: Trier
       erase: Effacer

data/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = "1.5.7"
+  VERSION = "1.5.11"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.11
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: http_accept_language
   requirement: !ruby/object:Gem::Requirement
@@ -450,14 +456,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: A modern and overridable admin gem, just the rails way.