slash_admin 1.5.6 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75a4d10e9ae3f3459f4f84a212d4cd959af543dfe9313daa264b860f057f93ad
-  data.tar.gz: 220d6763eea19e9eea0b556b092305d7e27b1cc25d075612df92888383f225e7
+  metadata.gz: 3e44e1ffffa251040a29d6c0475dc7bbdb6f8f10a37f964fcbcdb73a4c72c02a
+  data.tar.gz: 6179d302e57eea112b621656361cb863ce813fed1bc8f1f1e58cd2caea9c3d86
 SHA512:
-  metadata.gz: 68e65e9c493da98d401df31ff689bb752d67d2d4343083473b988ae5a228dbc03969778807e3199de72eb5f5d23c55f8934771020a447b18bc33feafdd424524
-  data.tar.gz: 93556b4c7d5e7078698f1cf30cab0ed0ac8900a5f6bf0d83570244c1c45eebcc814bbeacc5e79473416096018b137ebe63c037682f1ab69b847c9fc9a6a49894
+  metadata.gz: 2eaf5a8185b3fc853a0159c853be6bc5ba301fb6272401d305cc47623189211df42ff3e4b3026fb76cbc19311687e3feb4d034694a1a46cb7ae866114d78b45b
+  data.tar.gz: 2737b58165c8b74999c6d96faa5b83d55edad399388ada8b671759c3b5de3526d57c923ff87293b1130c7c71238311e90e26bb5dd64a21d94281cd73ed413919

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
+    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
@@ -157,6 +157,14 @@ module SlashAdmin
       {}
     end
 
+    def no_title
+      []
+    end
+
+    def icons
+      {}
+    end
+
     def handle_has_one
       @has_one = {}
       Array.wrap(update_params + create_params).uniq.each do |p|
@@ -214,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
@@ -342,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

@@ -28,13 +28,20 @@
         </th>
         <% list_params.each do |attr| %>
           <% if attr.is_a?(Hash) %>
-            <th>
-              <%= @model_class.human_attribute_name(attr.keys.first) %>
-              <% if tooltips.key? attr.keys.first %>
-                <a href="#" data-toggle="tooltip" data-placement="top" title="<%= tooltips[attr.keys.first] %>"><i class="fas fa-question-circle"></i></a>
-              <% end %>
-            </th>
+            <% if no_title.include? attr.keys.first %>
+              <th></th>
+            <% else %>
+              <th>
+                <%= @model_class.human_attribute_name(attr.keys.first) %>
+                <% if tooltips.key? attr.keys.first %>
+                  <a href="#" data-toggle="tooltip" data-placement="top" title="<%= tooltips[attr.keys.first] %>"><i class="fas fa-question-circle"></i></a>
+                <% end %>
+              </th>
+            <% end %>
           <% else %>
+            <% if no_title.include? attr %>
+              <th></th>
+            <% else %>
             <th
               <% if orderable?(@model_class, attr) %>
               data-order-field="<%= attr %>"
@@ -50,6 +57,7 @@
                 <a href="#" data-toggle="tooltip" data-placement="top" title="<%= tooltips[attr] %>"><i class="fas fa-question-circle"></i></a>
               <% end %>
             </th>
+            <% end %>
           <% end %>
         <% end %>
         <th class="text-center"><%= t('slash_admin.view.actions') %></th>
@@ -92,14 +100,27 @@
                 </td>
               <% 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 %>">
-                    <i class="fa fa-list"></i> <%= t('slash_admin.view.see') %>
+                  <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_of", model: attr.to_s.pluralize, of: m.name) %>"
+                  >
+                    <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,6 +26,7 @@ en:
       save: Save
       delete: Delete
       new: New
+      see_model_of: "View the %{model} of %{of}"
       edit: "Edit: %{model_name}"
       show: "Show: %{model_name}"
       tools: Tools

data/config/locales/fr.yml

@@ -29,6 +29,7 @@ fr:
       edit: "Édition: %{model_name}"
       show: "Affichage: %{model_name}"
       see: Voir
+      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.6"
+  VERSION = "1.5.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.10
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -457,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: A modern and overridable admin gem, just the rails way.