slash_admin 1.4.1 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11e65af2390efad19838b6a296c332d2390f7db2cc19d5e7fb3b194a20764e02
-  data.tar.gz: 6b8d9aeb8534270f7edf23f56a13d8284ed791d3fc08a85a5577adada253e075
+  metadata.gz: 66c021626154a42a86fbd5227ac9e5af5ae42bb8a908c0a0a3683dd6d7cb6f47
+  data.tar.gz: 8f8df399ea649c9d498221eac54d5216970d826d4626e6c6d96d3c01af37279f
 SHA512:
-  metadata.gz: 3198056fa8a35ae1d9e0005d86b44ef6e382675b63073deeb7974862a73b100cdeadef0ab6cd0f8f7ccf150c11ea0a38e95a42c149f41626393ba318144f33cf
-  data.tar.gz: e7e82ddba2244e1ca4c65d6f39cf8627793182bf36b709adae59f7b385364eeeeed4bee13d1fe2dade6b0edb295bdc1c03181921bae6c6449df84d42bc2da1f7
+  metadata.gz: 3a38afabe3fa6ebbf1178dea5f832a162d591ca9060202ed58d0c77dab48466ecffe666d4d8c130b61bf9421af862b89b50005ff6e710acc4038edd5816d66d6
+  data.tar.gz: 16cd83d5a57c4cfcc62b5d1a4e91993c2dba2fdffb3e1ea0d73f7dfe6f414a5f1108a332afaabd9ebe3d49ffb80f6a9a7553ca96e34aa4ca50187afe893fc5c1

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/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = "1.4.1"
+  VERSION = "1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: '1.5'
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails