alchemy-custom-model 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fd3b1365def03b70994ef5cdba868f1fc415224
-  data.tar.gz: 6433cd7510a5622b1c5edc7f0539082c2fc50cdb
+  metadata.gz: 8ed0ee1023ebbe7aa4406999e824b2cf0b23bc8e
+  data.tar.gz: 7d245b0a99f8ed1de3ecc347d03f7eeb79da2400
 SHA512:
-  metadata.gz: d66df91e327ed0dd2e90c7961dc28f747bcda68de29ac6d65452f5a9fa14d85f53809b91b599e5d58c045ef4f7304aa05ec5fad86b2c7b4721651e4dc7664b68
-  data.tar.gz: 65905483dbf78356fe8f20a749730c7f14b01295a855e98ded8e53a2e758b8133999f430215f39a818f5aba794ab7ff5c0f68d9f0c0956f9e30b16b51de267ce
+  metadata.gz: a174324f0a85e471597c66fd1602281cdd067915c897aed4b9815a73ee2012aaa4e4474960e3cc2bbd7da159925c567cb2bf4e80e24eb493f10bf16d5d5726da
+  data.tar.gz: 01fdb0b4e39999267464b77248c9cb81cef4e774165515323de6d62f797d16cf123007d44421f134cf9e0655725698270ccefe45efc5b9715c106244f74f42bb

data/app/controllers/alchemy/custom/model/admin/clones_controller.rb

@@ -5,8 +5,8 @@ module Alchemy
         class ClonesController < ::Alchemy::Custom::Model::Admin::BaseController
           def create
             @obj.assign_attributes clean_params
-            if @parent.present? and @obj.respond_to?("#{parent_model_name_demodulized}=".to_sym)
-              @obj.send "#{parent_model_name_demodulized}=", @parent
+            if @parent.present?
+              @obj.send("#{@obj.class.to_cloner_name}=",@parent)
             end
             @obj = yield @obj if block_given?
             if @obj.apply

data/app/helpers/alchemy/custom/model/admin/orders_helper.rb

@@ -19,8 +19,13 @@ module Alchemy::Custom::Model::Admin::OrdersHelper
     end
   end
 
-  def update_order_path(options = {})
+  def update_order_path(obj=nil,options = {})
+    if obj.nil?
     polymorphic_path([:admin, base_class.to_s.pluralize.underscore, :order], options)
+    else
+      polymorphic_path([:admin, obj, :order], options)
+
+    end
   end
 
   def print_order_identify(el)

data/app/models/alchemy/custom/model/cloner.rb

@@ -3,6 +3,8 @@ module Alchemy
     module Model
       class Cloner < ::ActiveType::Object
 
+
+
         attribute :language_id, :integer
         attribute :site_id, :integer
 
@@ -14,7 +16,7 @@ module Alchemy
         # ritorna true se il clone è andato a buon fine false altrimenti
         def apply
           if valid?
-            cloned = self.category.clone_to_other_lang self.attributes.with_indifferent_access
+            cloned = self.send(self.to_cloner_name).clone_to_other_lang(get_attributes_for_clone.with_indifferent_access)
             if cloned.valid?
               true
             else
@@ -30,6 +32,27 @@ module Alchemy
 
 
 
+        private
+        
+        class << self
+          def cloner_of(name,scope = nil, options={})
+            class_attribute :to_cloner_name
+            name = name.to_sym
+            if options[:foreign_key]
+              attribute options[:foreign_key]
+            else
+              attribute :"#{name}_id"
+            end
+            belongs_to name, scope, options
+            self.to_cloner_name = name
+          end
+        end
+        
+        def get_attributes_for_clone
+          self.attributes
+        end
+        
+        
         protected
 
         def check_lang_in_site

data/app/views/alchemy/custom/model/admin/orders/new.html.erb

@@ -22,7 +22,7 @@
       <%= t(:suggestion) %>
     </div>
     <div class="buttons">
-      <button name="button" type="submit" id="save_order" data-url-update=<%= update_order_path %>><%= t(:save_order) %>
+      <button name="button" type="submit" id="save_order" data-url-update=<%= update_order_path(@obj) %>><%= t(:save_order) %>
       </button>
     </div>
   </div>

data/lib/alchemy/custom/model/order.rb

@@ -31,9 +31,14 @@ module Alchemy::Custom::Model
 
 
       def update
+        if !self.class.method_for_show.blank?
+          klass= klass_for_show_elements
+        else
+          klass= self.parent_klass
+        end
         updated_nodes = params[:ordered_data]
-        self.parent_klass.transaction do
-          process_nodes updated_nodes, self.parent_klass
+        klass.transaction do
+          process_nodes updated_nodes, klass
         end
         redirect_to polymorphic_path([:admin, self.parent_klass])
       end
@@ -44,6 +49,10 @@ module Alchemy::Custom::Model
         self.class.parent_klass
       end
 
+      def klass_for_show_elements
+        self.class.method_for_show.to_s.singularize.classify.constantize
+      end
+
       private
 
       def check_parent

data/lib/alchemy/custom/model/version.rb

@@ -1,7 +1,7 @@
 module Alchemy
   module Custom
     module Model
-      VERSION = '2.0.1'
+      VERSION = '2.0.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-custom-model
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Alessandro Baccanelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A gem for semplify model implementation with Alchemy CMS