slash_admin 1.3.5 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccb3baa1e350b7dd50df3668174273bc00d7e1aa343181b1f79f8212281488cb
-  data.tar.gz: 2157f07a84cd25f6fa9bd3420d4ac6b0b540082afc07ea69d706517f6740672c
+  metadata.gz: dd6fca0261e85e32892848c0fc3b5ea84e76c839c410a6e0f37d05474cc41b1a
+  data.tar.gz: ee1e603f3e4acb9e0ea876f1aba28495ae7686eae58ea7be36dadb95ef68b644
 SHA512:
-  metadata.gz: 9af1af8597797ddb789f091c9d722c1edb6f3d9ebcdb28ec50b7e3051c170095bda6964f2970c080930a39c13f454642f2cf4ae79848c4f6d0decd7da9a6e0fb
-  data.tar.gz: 6ca2267f25300ba5d2a5323c160d23e17d184adbfabc0819264dfd44a4a9c3a08df051f22993b59bb78215a24a75fec02d2fcaeb42a4a8e644dd89d6e0a17595
+  metadata.gz: 79d797a173c872decb0062ba27623a110870ecf13039953f0c37d7cdad0dedcbe32a3d4b4028ce802e563c7023e25e9bee086f6b4774cd255de095e6a8f26f54
+  data.tar.gz: 2df908377331a6a5ed064c6b4a38784bad47d6f07b30d9cb0c7743ffd41918f30b345d53bedeac6db8acf35dd7233511dac88c3699ec0d76860b7177b625d368

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;
   }
 
@@ -266,20 +266,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 +422,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 +480,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 +565,10 @@ p[data-f-id="pbf"] {
         padding-left: 8px;
       }
 
+      .dropdown .dropdown-menu a.dropdown-item {
+        color: #7f96ac;
+      }
+
       .nav-item {
         margin: 0;
         padding: 0;

data/app/controllers/slash_admin/models_controller.rb

@@ -9,9 +9,9 @@ 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, :tooltips
+    helper_method :list_params, :export_params, :create_params, :update_params, :show_params, :nested_params, :should_add_translatable?, :translatable_params, :available_locales, :tooltips
 
     def index
       authorize! :index, @model_class
@@ -386,7 +386,7 @@ module SlashAdmin
     end
 
     def handle_default_translations
-      I18n.available_locales.reject { |key| key == :root }.each do |locale|
+      available_locales.reject { |key| key == :root }.each do |locale|
         translation = @model.translations.find_by_locale locale.to_s
         if translation.nil?
           @model.translations.build locale: locale
@@ -402,7 +402,11 @@ module SlashAdmin
       params[:filters] ||= []
     end
 
-    def handle_assocations
+    def available_locales
+      SlashAdmin.configuration.available_locales
+    end
+
+    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/_translatable_fields.html.erb

@@ -1,15 +1,15 @@
 <% if should_add_translatable? %>
   <h3 class="translations"><%= t('slash_admin.view.translations') %></h3>
   <nav class="nav nav-tabs" id="language-tabs" role="tablist">
-    <% I18n.available_locales.each do |locale| %>
-        <a class="nav-item nav-link <%= I18n.available_locales.first == locale ? 'active' : '' %>" id="nav-language-<%= locale %>" data-toggle="tab" href="#language-<%= locale %>" role="tab" aria-controls="language-<%= locale %>">
+    <% available_locales.each do |locale| %>
+        <a class="nav-item nav-link <%= available_locales.first == locale ? 'active' : '' %>" id="nav-language-<%= locale %>" data-toggle="tab" href="#language-<%= locale %>" role="tab" aria-controls="language-<%= locale %>">
           <img src='<%= image_path("slash_admin/#{locale.to_s}.png") %>' style="margin-right: 5px; max-width: 25px;">
         </a>
     <% end %>
   </nav>
   <div class="tab-content">
-    <% I18n.available_locales.each do |locale| %>
-      <div class="tab-pane fade <%= I18n.available_locales.first == locale ? 'show active' : '' %>" id="language-<%= locale %>" role="tabpanel" aria-labelledby="language-<%= locale %>-tab">
+    <% available_locales.each do |locale| %>
+      <div class="tab-pane fade <%= available_locales.first == locale ? 'show active' : '' %>" id="language-<%= locale %>" role="tabpanel" aria-labelledby="language-<%= locale %>-tab">
         <%= f.globalize_fields_for locale do |g| %>
           <% translatable_params.each do |a| %>
             <%= render 'slash_admin/fields/form_group', f: g, a: a %>

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,6 +8,8 @@ module SlashAdmin
       def install
         template "install.erb",
           "app/helpers/slash_admin/menu_helper.rb"
+        template "initializer.rb",
+                 "config/initializers/slash_admin.rb"
       end
     end
   end

data/lib/generators/slash_admin/install/templates/initializer.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+SlashAdmin.configure do |config|
+  # Do some config
+  # config.available_locales = I18n.available_locales
+end

data/lib/slash_admin.rb

@@ -23,4 +23,20 @@ require "http_accept_language"
 require "batch_translation"
 
 module SlashAdmin
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration)
+  end
+
+  class Configuration
+    attr_accessor :available_locales
+
+    def initialize
+      @available_locales = I18n.available_locales
+    end
+  end
 end

data/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = "1.3.5"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.5.2
 platform: ruby
 authors:
 - KOVACS Nicolas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-08-31 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
@@ -398,6 +399,7 @@ files:
 - lib/generators/slash_admin/controllers/controllers_generator.rb
 - lib/generators/slash_admin/controllers/templates/controllers.erb
 - lib/generators/slash_admin/install/install_generator.rb
+- lib/generators/slash_admin/install/templates/initializer.rb
 - lib/generators/slash_admin/install/templates/install.erb
 - lib/generators/slash_admin/override_admin/override_admin_generator.rb
 - lib/generators/slash_admin/override_admin/templates/admin.erb
@@ -439,7 +441,7 @@ homepage: https://github.com/nicovak/slash_admin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -454,8 +456,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A modern and overridable admin gem, just the rails way.
 test_files: []