slash_admin 1.5.5 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e05ff7dc688e9ce000ccc9b495ef50d15f426c793cc269e12a694f37cb3ee703
-  data.tar.gz: 97854cf7acee2e53de6edbc6aea3515d738c74d87073d83668b2a529cf221b88
+  metadata.gz: 88010a73a59d851d79e9ec5a1642fa6f6a8df7beb1ef864a7e0d7017f7ed4e64
+  data.tar.gz: 14d9b2012626a34b1be33a0a646524c317d7304543776af7cfa5b772d6d37cee
 SHA512:
-  metadata.gz: 5ccb114e9576d12d79fcf1e5ccbc35813046aec881098dc8aa796960715a37a4e0c3d1bc583c733484661ccc2f4650d1b6c0f94a42a8be06e1edcd3c62ebbe69
-  data.tar.gz: ddadcfcc2fae1e85525e34a338c6a93e4a169517ff4d5b9e0e6f76f5acf8d387d6a3f67a41681d1a8f944ffde55937f0322783330f8aea49b90fa8a74933b6a0
+  metadata.gz: 96c9018cc4f83b7c718fe96fc04675efeac895fd5dbd9703334ecfc664e81d4563eb190b1fd7d8a5e7dfca6b1e3bb76b03d66d5c51aab58a0aa31b23fa62f3f2
+  data.tar.gz: ab0ecfd5f77bee251f34a93aed0eb709310b705659457c330c485dd001a8db5dad615ec24d1e40ad97b2acee071f037df7e68de091c76107679200a1f49f5938

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

@@ -1493,3 +1493,9 @@ p[data-f-id="pbf"] {
     }
   }
 }
+
+.list-icon {
+  font-weight: 900;
+  display: flex;
+  align-items: center;
+}

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/fields/_belongs_to.html.erb

@@ -1,7 +1,7 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a).present? ? 'required' : ''}" %>
 <%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.collection_select a.to_s + '_id',
-  class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? "CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC" : "id DESC").limit(20), :id, object_label(class_name_from_association(f.object, a)),
+  class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? Arel.sql("CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC") : "id DESC" ).limit(20), :id, object_label(class_name_from_association(f.object, a)),
   {
     include_blank: true,
   },

data/app/views/slash_admin/fields/_has_many.html.erb

@@ -1,7 +1,7 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
 <%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.collection_select "#{a.to_s.singularize}_ids",
-class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? "CASE WHEN id IN(#{f.object.send(a).pluck(:id).join(',')}) THEN 1 ELSE 0 END DESC" : "id DESC").limit(20), :id,
+class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? Arel.sql("CASE WHEN id IN(#{f.object.send(a).pluck(:id).join(',')}) THEN 1 ELSE 0 END DESC") : "id DESC").limit(20), :id,
 object_label(class_name_from_association(f.object, a)),
 {include_blank: true},
 {

data/app/views/slash_admin/fields/_nested_belongs_to.html.erb

@@ -2,7 +2,7 @@
 <%= render 'slash_admin/shared/tooltip', a: a %>
 <% class_name_from_association = class_name_from_association(f.object, a) %>
 <%= f.collection_select a.to_s + '_id',
-                        class_name_from_association.constantize.all.order(f.object.send(a).present? ? "CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC" : "id DESC").limit(20), :id, object_label(a),
+                        class_name_from_association.constantize.all.order(f.object.send(a).present? ? Arel.sql("CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC") : "id DESC").limit(20), :id, object_label(a),
                         {
                           include_blank: true,
                         },

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.5"
+  VERSION = "1.5.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.9
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: http_accept_language
   requirement: !ruby/object:Gem::Requirement
@@ -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.