slash_admin 1.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8f3a52be4da9f7ddc2f3a4888ed7affa7a49aeeeecca3b54b6413d92fad5f5
-  data.tar.gz: 10bda4bc75d87a697aedb1d5f8ee48d0f5203892aeebb9d7d985a2dc8a509897
+  metadata.gz: 11e65af2390efad19838b6a296c332d2390f7db2cc19d5e7fb3b194a20764e02
+  data.tar.gz: 6b8d9aeb8534270f7edf23f56a13d8284ed791d3fc08a85a5577adada253e075
 SHA512:
-  metadata.gz: a057c62b96bc937e332365d5b1277e598f4839af757ca616000e5f06da51a1c043087ab4ed20e18b1071f1881c2639306c0c319a74d8ba5c7a9df2e152e229ff
-  data.tar.gz: 054aee793717a4df3bcb2aeccc26fea5e21286e7a1e2bd25d5a3e97b0be11b1962356f380bfa7e7a7342066f51a7001ba22cc10b54c43a912cc6fcb3e33fd8a7
+  metadata.gz: 3198056fa8a35ae1d9e0005d86b44ef6e382675b63073deeb7974862a73b100cdeadef0ab6cd0f8f7ccf150c11ea0a38e95a42c149f41626393ba318144f33cf
+  data.tar.gz: e7e82ddba2244e1ca4c65d6f39cf8627793182bf36b709adae59f7b385364eeeeed4bee13d1fe2dade6b0edb295bdc1c03181921bae6c6449df84d42bc2da1f7

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;

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

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

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.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.4.1
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-06-19 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