five-two-nw-olivander 0.2.0.12 → 0.2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53428f87f834a6688a74a6cf57a397a782a2db6564323e553bf2b6ee8bc2c5b7
-  data.tar.gz: 9c9806f86484aac3c3ae2ea0c507cec257c70441b9e8c75898a3357a410c9f38
+  metadata.gz: aed9cd5294bad36b42c4ccf1bf3e5cc42a1143840b5dd26567d72e3bdabccc70
+  data.tar.gz: c3ea995ad812717f1ebe0741e398db06c4c7dc5171518da53ca81b0ac307a57b
 SHA512:
-  metadata.gz: bbdfe42a7b0334f2d9982ce924a87705013a3a23efc028464aeb3939b4eada997e21ed58d6b32136de9189a09bf215329bab2ab4b75d046e4359c480fb26ef79
-  data.tar.gz: 2092202bf22b34e041d672ff7b407b7f7556b1b879f917d81ee153ebc8f6c507e5490af8e8a294a67a098130933abb1c69316ab39c1592ae77e0b47b1a1ae0b2
+  metadata.gz: a098d569b60f79a1c76e7b3858110f1c6ca670c12e95009af0f1669a0877748aaa528e0ee085fcfbef498a9dbd690d126cf3ca14c35d71232088be4dd2de1d7a
+  data.tar.gz: ee64f8f78f9ace8439bd0235099238f80cfc5c6702de1c1c5ff0fa900fb09986fc2bc33bf3e6e1e614bc10832210b770d10b7ebf78ef1886af1fbfc16bbeea4e

data/app/assets/javascripts/controllers/input_control_association_controller.js

@@ -6,12 +6,12 @@ export default class extends Controller {
     var self = this,
         el = self.element;
 
-    console.log('did we do anything')
-    if (!$(el).hasClass("select2-hidden-accessible")) {
+    if (el.dataset.forceSelect2 || !$(el).hasClass("select2-hidden-accessible")) {
       $(el).select2({
         dropdownParent: $(el).parent(),
         minimumInputLength: el.dataset.minimumInputLength || 0,
         tags: el.dataset.taggable == 'true',
+        placeholder: el.dataset.placeholder || 'Select...',
         createTag: function (tag) {
           return {
               id: tag.term,
@@ -24,7 +24,6 @@ export default class extends Controller {
           delay: 250,
           dataType: 'json',
           data: function(params) {
-            console.log(params)
             var hash = {
               term: params.term,
               _type: params._type,

data/app/controllers/concerns/olivander/resources/crud_controller.rb

@@ -53,6 +53,24 @@ module Olivander
           end
         end
 
+        def show
+          Rails.logger.info 'Processed by Effective::CrudController#show'
+
+          self.resource ||= resource_scope.find(params[:id])
+
+          EffectiveResources.authorize!(self, :show, resource)
+          @page_title ||= resource.to_s
+
+          run_callbacks(:resource_render)
+
+          respond_to do |format|
+            format.html { }
+            format.js { render('show', formats: :js) }
+            format.json { render json: resource }
+            format.turbo_stream {}
+          end
+        end
+
         def permitted_params
           params.fetch(resource_klass.name.underscore.gsub('/', '_').to_sym, {}).permit!
         end
@@ -79,6 +97,7 @@ module Olivander
                   )
                 end
               end
+              format.json { render json: resource }
             end
           elsif template_present?(action)
             respond_to do |format|

data/app/inputs/date_time_input.rb

@@ -6,13 +6,19 @@ class DateTimeInput < SimpleForm::Inputs::Base
 
     disabled = options[:disabled] || false
 
-    field = @builder.text_field(attribute_name, id: "#{attribute_name}_datetimepicker", class: 'form-control', value: raw_value, disabled: disabled, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker")
+    hash = { id: "#{attribute_name}_datetimepicker", class: 'form-control', value: raw_value, disabled: disabled, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker" }
+    data = options[:data]
+    data.keys.each do |d|
+      hash["data-#{d.to_s.dasherize}".to_sym] = data[d]
+    end
+    field = @builder.text_field(attribute_name, hash)
 
     add_on_class = options[:add_on_class] || "fa fa-calendar"
 
     add_on = template.content_tag(:div, class: "input-group-prepend") do
       add_on = template.content_tag(:div, class: "input-group-text") do
-        template.content_tag(:i, '', :class => add_on_class, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker")
+        hash = { class: add_on_class, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker" }
+        template.content_tag(:i, '', hash)
       end
     end
 

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.2.0.12'.freeze
+  VERSION = '0.2.0.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.12
+  version: 0.2.0.14
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-01 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick