tramway-admin 1.27.0.2 → 1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 139229280999ef256b88e2ae66db5dfb8fe27eabfe81fc929fa2fccade0c04cc
-  data.tar.gz: 66e2978155ad38869601b791d6c831a36a5adc6c08f382176028b1536ac06ed2
+  metadata.gz: 85962c2ec92a777e283621ee5dbb244184ede26066d068bcedd6c54be51725b3
+  data.tar.gz: 05457ce11d004c93e0df535d2eed83bdd528408afcc478671141608c920e95d6
 SHA512:
-  metadata.gz: 86dc8f5b920df19e5ff63dffcb6d8d9b99458f48ed876d3ec320f54b93055b50c3919b597ce47e69ed4d5d7de3f212605897d4ef0a5a7e3c82375cca86d4a1c6
-  data.tar.gz: f4eff5d1c290fb72cc6a79c6c4583d952591d4a104e4630cdaa4e113aafe3beb0b9973032afc77c01c4019481d3cea90cb5cab7b551bdf51e92553447c817b35
+  metadata.gz: f9f7650c4ba3413663abcf989c26a514c5b0453f1e5be5a12615f4fd8dd697638a73fb354534f682c9c409228231093bc51206ffbbe1d359d8f942f0df720feb
+  data.tar.gz: d26680183f6f456f14091e40e018c5f1ed456189b8c8989fb15b6956ac56da19a1141de90c34270bdbe9bd42839b232a4c945ab23cd89f6c761078277ca06582

data/app/helpers/tramway/admin/actions_helper.rb

@@ -3,7 +3,7 @@ module Tramway::Admin::ActionsHelper
     ::Tramway::Admin.action_is_available?(
       association_object,
       project: (@application_engine || @application.name),
-      model: association_object.model.class,
+      model_name: association_object.model.class.name,
       role: current_user.role,
       action: :destroy
     ) 

data/app/helpers/tramway/admin/inputs_helper.rb

@@ -3,11 +3,14 @@
 module Tramway
   module Admin
     module InputsHelper
-      def association_params(form_object:, property:, value:, object:)
+      def association_params(form_object:, property:, value:, object:, options: {})
         full_class_name_association = form_object.class.full_class_name_association(property)
         unless full_class_name_association
           raise "It seems you\'ve defined association attributes with `property` method. Please, use `association` method. `association :#{property}`"
         end
+        if full_class_name_association.is_a? Array
+          raise "It seems you've used `association` input type in the Form. Please, use `polymorphic_association` type. `#{property}: :polymorphic_association`"
+        end
 
         {
           label: false,
@@ -20,30 +23,38 @@ module Tramway
           collection: full_class_name_association.active.map do |obj|
             decorator_class(full_class_name_association).decorate obj
           end.sort_by(&:name)
-        }
+        }.merge options
       end
 
-      def polymorphic_association_params(object:, form_object:, property:, value:)
+      def polymorphic_association_params(object:, form_object:, property:, value:, options: {})
         full_class_names = form_object.model.class.send("#{property}_type").values.map &:constantize
         collection = full_class_names.map do |class_name|
           class_name.active.map do |obj|
             decorator_class(class_name).decorate obj
           end
         end.flatten.sort_by { |obj| obj.name.to_s }
+        builded_value = if form_object.send(property).present?
+                          "#{form_object.send(property).class.to_s.underscore}_#{form_object.send(property).id}"
+                        else
+                          "#{value[:type]&.underscore}_#{value[:id]}"
+                        end
         {
           as: :select,
           label: false,
           input_html: {
             name: "#{object}[#{property}]",
             id: "#{object}_#{property}",
-            value: (form_object.send(property) || form_object.model.send("#{property}_id") || value)
+            value: builded_value
           },
-          selected: (form_object.model.send("#{property}_id") || value),
+          selected: builded_value,
           collection: collection,
           label_method: lambda do |obj|
             "#{obj.class.model_name.human} | #{obj.name}"
+          end,
+          value_method: lambda do |obj|
+            "#{obj.class.to_s.underscore.sub(/_decorator$/, '')}_#{obj.id}"
           end
-        }
+        }.merge options
       end
 
       def value_from_params(model_class:, property:, type:)
@@ -57,6 +68,30 @@ module Tramway
           params.dig(model_class.to_s.underscore, property.to_s)
         end
       end
+
+      def default_params(property:, object:, form_object:, value:, options: {})
+        {
+          label: false,
+          input_html: {
+            name: "#{object}[#{property}]",
+            id: "#{object}_#{property}",
+            value: (form_object.send(property) || form_object.model.send(property) || value)
+          },
+          selected: (form_object.model.send(property) || value)
+        }.merge options
+      end
+
+      def else_params(property:, object:, type:, form_object:, value:, options: {})
+        {
+          as: type,
+          label: false,
+          input_html: {
+            name: "#{object}[#{property}]",
+            id: "#{object}_#{property}",
+            value: (form_object.send(property) || form_object.model.send(property) || value)
+          }
+        }.merge options
+      end
     end
   end
 end

data/app/helpers/tramway/admin/records_helper.rb

@@ -81,17 +81,17 @@ module Tramway::Admin
 
       if association.options[:as].present? # polymorphic? conditiion
         new_record_path model: association.class_name,
-                        redirect: current_model_record_path(object),
-                        association.options[:class_name].underscore => {
-                          association.options[:as] => object.id,
-                          association.type => object.class.model_name
-                        }
+          redirect: current_model_record_path(object.model),
+          association.options[:class_name].underscore => {
+            association.options[:as] => object.id,
+            association.type => object.class.model_name
+          }
       else
         new_record_path model: association.class_name,
-                        redirect: current_model_record_path(object.model),
-                        association.options[:class_name].underscore => {
-                          as || object.model.class.name.underscore => object.id
-                        }
+          redirect: current_model_record_path(object.model),
+          association.options[:class_name].underscore => {
+            as || object.model.class.name.underscore => object.id
+          }
       end
     end
   end

data/app/views/tramway/admin/shared/_input.html.haml

@@ -1,32 +1,21 @@
 - value = value_from_params(model_class: model_class, property: property, type: type)
 - form_object = instance_variable_get "@#{object}_form"
-- if type.class.in? [ Symbol, String ]
+- input_params = { property: property, object: object, form_object: form_object, value: value }
+- if !type.class.in?([ Symbol, String ]) && type[:input_options]
+  - input_params.merge!(options: type[:input_options])
+  - type = type[:type]
+- if type.class.in?([ Symbol, String ]) || type&.dig(:input_options)
   - type = type.to_sym
   = form.label form_object.model.class.human_attribute_name property
   - case type
   - when :default
-    = form.input property, label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) }, selected: (form_object.model.send(property) || value)
+    = form.input property, **default_params(**input_params)
   - when :association
-    = form.association property, **association_params(form_object: form_object, property: property, value: value, object: object)
+    = form.association property, **association_params(**input_params)
   - when :polymorphic_association
-    = form.input property, **polymorphic_association_params(object: object, form_object: form_object, property: property, value: value[:id])
-    = form.input "#{property}_type", input_html: { name: "#{object}[#{property}_type]", id: "#{object}_#{property}_type", value: (form_object.send(property) || form_object.model.send("#{property}_type") || value[:type]) }, selected: (form_object.model.send("#{property}_type") || value[:type])
+    = form.input property, **polymorphic_association_params(**input_params.merge(value: value))
   - else
-    = form.input property, as: type, label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) }
+    = form.input property, **else_params(**input_params.merge(type: type))
 - else
-  - if type[:input_options]
-    - options = type[:input_options]
-    = form.label form_object.model.class.human_attribute_name property
-    - case type[:type]
-    - when :default
-      = form.input property, label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) }, selected: (form_object.model.send(property) || value), **options
-    - when :association
-      = form.association property, **association_params(form_object: form_object, property: property, value: value, object: object), **options
-    - when :polymorphic_association
-      = form.input property, **polymorphic_association_params(object: object, form_object: form_object, property: property, value: value[:id])
-      = form.input "#{property}_type", input_html: { name: "#{object}[#{property}_type]", id: "#{object}_#{property}_type", value: (form_object.send(property) || form_object.model.send("#{property}_type") || value[:type]) }, selected: (form_object.model.send("#{property}_type") || value[:type]), **options
-    - else
-      = form.input property, as: type[:type].to_sym, label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) }, **options
-  - else
-    - property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
-    = render 'tramway/core/shared/input_extended', field: type[:extended_form_property], class_name: :record, value: property_value, f: form
+  - property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
+  = render 'tramway/core/shared/input_extended', field: type[:extended_form_property], class_name: :record, value: property_value, f: form

data/lib/tramway/admin.rb

@@ -52,8 +52,8 @@ module Tramway
         end&.flatten || []
       end
 
-      def action_is_available?(record, project:, role:, model:, action:)
-        actions = select_actions(project: project, role: role, model: model)
+      def action_is_available?(record, project:, role:, model_name:, action:)
+        actions = select_actions(project: project, role: role, model_name: model_name)
         availability = actions&.select do |a|
           if a.is_a? Symbol
             a == action.to_sym
@@ -68,8 +68,14 @@ module Tramway
         availability.values.first.call record
       end
 
-      def select_actions(project:, role:, model:)
-        @singleton_models&.dig(project, role, model) || @available_models&.dig(project, role, model)
+      def select_actions(project:, role:, model_name:)
+        stringify_keys(@singleton_models&.dig(project, role))&.dig(model_name) || stringify_keys(@available_models&.dig(project, role))&.dig(model_name)
+      end
+
+      def stringify_keys(hash)
+        hash&.reduce({}) do |new_hash, pair|
+          new_hash.merge! pair[0].to_s => pair[1]
+        end
       end
     end
   end

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.27.0.2'
+    VERSION = '1.28'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.27.0.2
+  version: '1.28'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views