slash_admin 1.4 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8f3a52be4da9f7ddc2f3a4888ed7affa7a49aeeeecca3b54b6413d92fad5f5
-  data.tar.gz: 10bda4bc75d87a697aedb1d5f8ee48d0f5203892aeebb9d7d985a2dc8a509897
+  metadata.gz: 6caa63d44c0fd3a5ff6acafec4a72e9ac6cf3edd82ee433b0ce21abcb39d8747
+  data.tar.gz: 7f049cb5a8bac129a0767f73be8fd690793f69973e98097b2acb38139337d610
 SHA512:
-  metadata.gz: a057c62b96bc937e332365d5b1277e598f4839af757ca616000e5f06da51a1c043087ab4ed20e18b1071f1881c2639306c0c319a74d8ba5c7a9df2e152e229ff
-  data.tar.gz: 054aee793717a4df3bcb2aeccc26fea5e21286e7a1e2bd25d5a3e97b0be11b1962356f380bfa7e7a7342066f51a7001ba22cc10b54c43a912cc6fcb3e33fd8a7
+  metadata.gz: cf211059c6d8c11879a51e534978e3bafad97cc5207d9fcf4c62e4c9da78e0323a49267cc1298a5e8d0c919850d9b2a4ac162b4ea8a1625fb5bcaaf2211ca05a
+  data.tar.gz: 94393cada60879a3b3d285bdd789f83c3eeadb5bcec2127feff2103436b9db2177388fbbef505a6bc0bcf61b89645c210fcf3eece9bc6ac464f850c59156e089

data/README.md

@@ -86,8 +86,8 @@ If your apps uses Sprockets 4+, you'll need to add SlashAdmin assets to your `ma
 `app/assets/config/manifest.js`
 
 ```
-//= link administrate/application.css
-//= link administrate/application.js
+//= link slash_admin/application.css
+//= link slash_admin/application.js
 ```
 
 `config/routes.rb`

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

@@ -91,7 +91,7 @@ p[data-f-id="pbf"] {
   margin: 0;
 
   label.form-control-label {
-    display: block;
+    display: inline-block;
     font-weight: 600;
   }
 
@@ -252,7 +252,6 @@ p[data-f-id="pbf"] {
   }
 
   .tag-boolean {
-    width: 45px;
     text-align: center;
     display: inline-block;
   }
@@ -266,20 +265,6 @@ p[data-f-id="pbf"] {
     }
   }
 
-  .field_with_errors {
-    label {
-      color: $red;
-    }
-
-    input {
-      border-color: $red !important;
-    }
-
-    & + .form-control-feedback {
-      color: $red;
-    }
-  }
-
   .block-language {
     display: block;
     margin: 15px 0;
@@ -436,6 +421,16 @@ p[data-f-id="pbf"] {
     color: $primary;
   }
 
+  .has-danger {
+    .form-control, input, select, textarea {
+      border-color: $error !important;
+    }
+
+    label, .form-control-feedback {
+      color: $error !important;
+    }
+  }
+
   .scroll-to-top {
     text-align: center;
     position: fixed;
@@ -484,11 +479,9 @@ p[data-f-id="pbf"] {
 
   .badge {
     font-size: 11px;
-    font-weight: 300;
     height: 18px;
     color: #fff;
     padding: 3px 6px;
-    border-radius: 12px;
     text-shadow: none;
     text-align: center;
     vertical-align: middle;
@@ -571,6 +564,10 @@ p[data-f-id="pbf"] {
         padding-left: 8px;
       }
 
+      .dropdown .dropdown-menu a.dropdown-item {
+        color: #7f96ac;
+      }
+
       .nav-item {
         margin: 0;
         padding: 0;
@@ -1242,9 +1239,12 @@ p[data-f-id="pbf"] {
   .datatable_wrapper {
     .tag {
       font-size: 13px;
-      padding: 2px 5px;
+      padding: 2px 8px;
       color: #fff;
       text-transform: uppercase;
+      a, a:hover, a:visited, a:active {
+        color: #fff;
+      }
     }
   }
 

data/app/controllers/slash_admin/models_controller.rb

@@ -9,7 +9,7 @@ module SlashAdmin
     before_action :handle_default
     before_action :nestable_config
     before_action :handle_default_params
-    before_action :handle_assocations
+    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
 
@@ -406,7 +406,7 @@ module SlashAdmin
       SlashAdmin.configuration.available_locales
     end
 
-    def handle_assocations
+    def handle_associations
       @belongs_to_fields = @model_class.reflect_on_all_associations(:belongs_to).map(&:name)
       @has_many_fields = @model_class.reflect_on_all_associations(:has_many).map(&:name)
       @has_one_fields = @model_class.reflect_on_all_associations(:has_one).map(&:name)

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

@@ -75,7 +75,9 @@
                   <% end %>
                 </td>
               <% else %>
-                <td class="<%= attr.to_s.parameterize.underscore.downcase %>"><%= render attr.keys.first.to_s, model: m %></td>
+                <td class="<%= attr.to_s.parameterize.underscore.downcase %>">
+                  <%= render attr[attr.keys.first][:type].to_s, model: m, attr: attr.keys.first %>
+                </td>
               <% end %>
             <% else %>
               <% if m.send(attr).is_a?(TrueClass) || m.send(attr).is_a?(FalseClass) %>

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

@@ -60,6 +60,13 @@
             <% else %>
               <td>&nbsp;</td>
             <% end %>
+        <% elsif attr.is_a?(Hash) && attr[:filter].present? %>
+            <td>
+              <% case attr[:filter] %>
+              <% when :text, :string %>
+                <input type="text" name="filters[<%= attr.keys.first %>]" value="<%= params[:filters][attr.keys.first] rescue nil %>" class="form-control form-control-sm"/>
+              <% end %>
+            </td>
         <% else %>
           <td>&nbsp;</td>
         <% end %>

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

@@ -0,0 +1 @@
+<%= truncate(strip_tags(model.send(attr)), length: 50) %>

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

@@ -1,11 +1,16 @@
 <%= 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)),
-                        {
-                          include_blank: true,
-                        },
-                        'data-placeholder': t('slash_admin.view.select_model', model_name: class_name_from_association(f.object, a).constantize.model_name.human.downcase),
-                        'data-model': class_name_from_association(f.object, a).constantize.model_name.to_s.underscore,
-                        'data-fields': "SlashAdmin::Models::#{class_name_from_association(f.object, a).classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
-                        class: 'form-control select2-model-single', required: required?(f.object, a).present? %>
+  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)),
+  {
+    include_blank: true,
+  },
+  {
+    'data-placeholder': t('slash_admin.view.select_model', model_name: class_name_from_association(f.object, a).constantize.model_name.human.downcase),
+    'data-model': class_name_from_association(f.object, a).constantize.model_name.to_s.underscore,
+    'data-fields': "SlashAdmin::Models::#{class_name_from_association(f.object, a).classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
+    class: 'form-control select2-model-single',
+    required: required?(f.object, a).present?,
+    selected: f.object.send(a).present? ? f.object.send(a).try(:id) : nil,
+  }
+%>

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

@@ -1,11 +1,13 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a).present? ? 'required' : ''}" %>
 <%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.select a.to_s,
-             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).collect { |assoc| [assoc.send(object_label(class_name_from_association(f.object, a))), assoc.id] },
-             {
-               include_blank: true,
-             },
-             'data-placeholder': t('slash_admin.view.select_model', model_name: class_name_from_association(f.object, a).constantize.model_name.human.downcase),
-             'data-model': class_name_from_association(f.object, a).constantize.model_name.to_s.underscore,
-             'data-fields': "SlashAdmin::Models::#{class_name_from_association(f.object, a).classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
-             class: 'form-control select2-model-single', required: required?(f.object, a).present? %>
+  options_for_select(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).collect { |assoc| [assoc.send(object_label(class_name_from_association(f.object, a))), assoc.id] }, f.object.send(a).present? ? f.object.send(a).try(:id) : nil),
+  {
+   include_blank: true,
+  },
+  'data-placeholder': t('slash_admin.view.select_model', model_name: class_name_from_association(f.object, a).constantize.model_name.human.downcase),
+  'data-model': class_name_from_association(f.object, a).constantize.model_name.to_s.underscore,
+  'data-fields': "SlashAdmin::Models::#{class_name_from_association(f.object, a).classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
+  class: 'form-control select2-model-single',
+  required: required?(f.object, a).present?
+%>

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

@@ -10,8 +10,12 @@
     <div class="navbar-nav mr-auto mt-2 mt-lg-0">
     </div>
     <ul class="nav right-nav-fix">
-      <li class="nav-item">
-        <a class="nav-link">
+      <li class="nav-item <%= can?(:update, current_admin) ? 'dropdown' : '' %>">
+        <% if can?(:update, current_admin) %>
+          <a class= "nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown">
+        <% else %>
+          <a class="nav-link">
+        <% end %>
           <% if current_admin.avatar.present? %>
             <img src="<%= current_admin.avatar.url %>" class="rounded-circle"/>
           <% else %>
@@ -19,6 +23,13 @@
           <% end %>
           <span class=""><%= current_admin.login %></span>
         </a>
+        <% if can?(:update, current_admin) %>
+        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+          <a href="<%= edit_slash_admin_admin_path current_admin %>" class="dropdown-item">
+            <i class="fas fa-user-circle"></i> <%= t('slash_admin.view.edit_account') %>
+          </a>
+        </div>
+        <% end %>
       </li>
 
       <li class="nav-item">

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
         error: Impossible to create '%{model_name}'
         success: Operation successed.
     view:
+      edit_account: Edit my Account
       fill_login_and_password: "Please enter your credentials to proceed."
       administration: Administration
       home: Home

data/config/locales/fr.yml

@@ -13,6 +13,7 @@ fr:
         error: Impossible de trier '%{model_name}'
         success: Opération réussi.
     view:
+      edit_account: Modifier mon Compte
       fill_login_and_password: "Merci d'entrer votre identifiant et mot de passe."
       administration: Administration
       home: Accueil

data/lib/generators/slash_admin/install/install_generator.rb

@@ -8,7 +8,7 @@ module SlashAdmin
       def install
         template "install.erb",
           "app/helpers/slash_admin/menu_helper.rb"
-        template "initializer.erb",
+        template "initializer.rb",
                  "config/initializers/slash_admin.rb"
       end
     end

data/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = "1.4"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.5.3
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -342,6 +342,7 @@ files:
 - app/views/slash_admin/base/_data_show.html.erb
 - app/views/slash_admin/base/_filters.html.erb
 - app/views/slash_admin/base/_translatable_fields.html.erb
+- app/views/slash_admin/base/_wysiwyg.html.erb
 - app/views/slash_admin/base/edit.html.erb
 - app/views/slash_admin/base/index.html.erb
 - app/views/slash_admin/base/index.xls.erb
@@ -455,7 +456,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A modern and overridable admin gem, just the rails way.