slash_admin 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c492084c28af99b79339457415f1c9cabb8dfc933b5d768b4a456521118abe
-  data.tar.gz: 3b499b584c19cae24461b73d64e239196f5dd2f52b18d22f9e529e456850ac87
+  metadata.gz: 60a62e71df7ce85dd3b7a4ec43387b2487e6b785173efe76bf68af86f9ebc0f3
+  data.tar.gz: '0280264757dfe91230cdf5b359b577fe1bfdaf0914bc255593e92da0e98595b4'
 SHA512:
-  metadata.gz: 7dbf6990a0a0f70213a37f6340721f0be1a8d2db55fb7820f54055170e741e01d5fd6a4d4c7fad043ef6667b816a47ec712bc232683c6b741c8eb9219562aece
-  data.tar.gz: fe6fcdf161dcd72a63b69a155764cc7630cc235f24141676d2d987dd61bf25cc753d604b2d6d85907b960834679d2853fd36a1c96b30bc471dea14c57bcd97ca
+  metadata.gz: c02ac33b7adeeb9fb6dfe8b9986ff253b66fee5dc23674587eb27db2ff16c5997dfa2ac14e578f56e5d3b0a0410f56594a93b37be586be1aa0584ee40b3b1682
+  data.tar.gz: c4153fff71a6d0fe535ddeb0992feed99388a31a73b661de066139f32e75247998d4f21fcbfcf05ca222b57c181474bd7f32793f351f95dc42779841a43f0621

data/app/assets/javascripts/slash_admin/application.js

@@ -5,7 +5,9 @@
 //= require jquery_ujs
 //= require popper
 //= require bootstrap
-//= require select2.min
+//= require select2/select2.min
+//= require select2/i18n/fr
+//= require select2/i18n/en
 //= require moment
 //= require moment/fr
 //= require bootstrap-material-datetimepicker
@@ -205,12 +207,12 @@ function init() {
 
 
   $(".select2-single, .select2-multiple").each (function() {
-    let initialPlaceholder = $(this).attr('placeholder');
+    let initialPlaceholder = $(this).attr('data-placeholder') || I18n.t('slash_admin.view.select');
+
     $(this).select2({
       placeholder: initialPlaceholder,
       allowClear: true,
       theme: 'bootstrap4',
-      debug: true,
     }).on("select2:unselecting", function (e) {
       $(this).data('state', 'unselected');
     }).on("select2:open", function (e) {
@@ -232,7 +234,6 @@ function init() {
       placeholder: initialPlaceholder,
       allowClear: true,
       theme: 'bootstrap4',
-      debug: true,
       ajax: {
         url: Routes.slash_admin_remote_select_path({
           format: "json"

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

@@ -14,8 +14,8 @@
  *= require toastr
  *= require jquery.nestable
  *= require sweetalert
- *= require select2.min
- *= require select2-bootstrap4
+ *= require select2/select2.min
+ *= require select2/select2-bootstrap4
  *= require bootstrap-datepicker.min
  *= require bootstrap-material-datetimepicker
  *= require jquery.tagsinput-revisited.min

data/app/views/slash_admin/custom_fields/_select.html.erb

@@ -1,7 +1,13 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
 <%= render 'slash_admin/shared/tooltip', a: a %>
-<% if a[a.keys.first][:multiple].present? && a[a.keys.first][:multiple] == true %>
-  <%= f.select(a.keys.first, a[a.keys.first][:choices], { include_blank: a[a.keys.first][:include_blank], required: required?(f.object, a) }, class: 'form-control select2-multiple', multiple: true) %>
+<% if a[a.keys.first][:multiple].present? %>
+  <%= f.select(a.keys.first, a[a.keys.first][:choices],
+               { include_blank: a[a.keys.first][:include_blank], required: required?(f.object, a) },
+               'data-placeholder': t('slash_admin.view.select_model', model_name: @model_class.human_attribute_name(a.keys.first).singularize.downcase),
+               class: 'form-control select2-multiple', multiple: true) %>
 <% else %>
-  <%= f.select(a.keys.first, a[a.keys.first][:choices], { include_blank: a[a.keys.first][:include_blank], required: required?(f.object, a) }, class: 'form-control select2-single') %>
+  <%= f.select(a.keys.first, a[a.keys.first][:choices],
+               { include_blank: a[a.keys.first][:include_blank], required: required?(f.object, a) },
+               'data-placeholder': t('slash_admin.view.select_model', model_name: @model_class.human_attribute_name(a.keys.first).singularize.downcase),
+               class: 'form-control select2-single') %>
 <% end %>

data/app/views/slash_admin/custom_fields/_timezone.html.erb

@@ -1,3 +1,6 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
 <%= render 'slash_admin/shared/tooltip', a: a %>
-<%= f.select(a.keys.first, ActiveSupport::TimeZone::MAPPING.values, { include_blank: true, required: required?(f.object, a) }, class: 'form-control select2-single') %>
+<%= f.select(a.keys.first, ActiveSupport::TimeZone::MAPPING.values,
+             { include_blank: true, required: required?(f.object, a) },
+             'data-placeholder': t('slash_admin.view.select_model', model_name: @model_class.human_attribute_name(a.keys.first).singularize.downcase),
+             class: 'form-control select2-single') %>

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

@@ -3,7 +3,7 @@
 <%= 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)),
                         {
-                          prompt: "",
+                          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/app/views/slash_admin/fields/_has_one.html.erb

@@ -3,7 +3,7 @@
 <%= 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] },
              {
-               prompt: "",
+               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/app/views/slash_admin/fields/_nested_belongs_to.html.erb

@@ -4,7 +4,7 @@
 <%= 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),
                         {
-                          prompt: "",
+                          include_blank: true,
                         },
                         'data-placeholder': t('slash_admin.view.select_model', model_name: class_name_from_association.constantize.model_name.human.downcase),
                         'data-model': class_name_from_association.constantize.model_name.to_s.underscore,

data/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/vendor/assets/javascripts/select2/i18n/en.js

@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Please delete "+n+" character";return 1!=n&&(r+="s"),r},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var n="You can only select "+e.maximum+" item";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define,e.require}();

data/vendor/assets/javascripts/select2/i18n/fr.js

@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/fr",[],function(){return{errorLoading:function(){return"Les résultats ne peuvent pas être chargés."},inputTooLong:function(e){var n=e.input.length-e.maximum;return"Supprimez "+n+" caractère"+(n>1?"s":"")},inputTooShort:function(e){var n=e.minimum-e.input.length;return"Saisissez au moins "+n+" caractère"+(n>1?"s":"")},loadingMore:function(){return"Chargement de résultats supplémentaires…"},maximumSelected:function(e){return"Vous pouvez seulement sélectionner "+e.maximum+" élément"+(e.maximum>1?"s":"")},noResults:function(){return"Aucun résultat trouvé"},searching:function(){return"Recherche en cours…"},removeAllItems:function(){return"Supprimer tous les éléments"}}}),e.define,e.require}();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - KOVACS Nicolas
@@ -420,7 +420,9 @@ files:
 - vendor/assets/javascripts/codemirror/mode/javascript.js
 - vendor/assets/javascripts/jquery.nestable.js
 - vendor/assets/javascripts/jquery.tagsinput-revisited.min.js
-- vendor/assets/javascripts/select2.min.js
+- vendor/assets/javascripts/select2/i18n/en.js
+- vendor/assets/javascripts/select2/i18n/fr.js
+- vendor/assets/javascripts/select2/select2.min.js
 - vendor/assets/javascripts/toastr.js
 - vendor/assets/stylesheets/animate.css
 - vendor/assets/stylesheets/bootstrap-datepicker.min.css
@@ -430,8 +432,8 @@ files:
 - vendor/assets/stylesheets/codemirror/theme/relax-seti.css
 - vendor/assets/stylesheets/jquery.nestable.css
 - vendor/assets/stylesheets/jquery.tagsinput-revisited.min.css
-- vendor/assets/stylesheets/select2-bootstrap4.css
-- vendor/assets/stylesheets/select2.min.css
+- vendor/assets/stylesheets/select2/select2-bootstrap4.css
+- vendor/assets/stylesheets/select2/select2.min.css
 - vendor/assets/stylesheets/sweetalert.css
 - vendor/assets/stylesheets/toastr.css
 homepage: https://github.com/nicovak/slash_admin