vidl-toolbox 0.0.10 → 0.0.11

data/lib/toolbox/default_controller.rb

@@ -285,14 +285,30 @@ module Toolbox
         edit_config(rec).controlsets.each do |controlset|
           controlset.widget_list.widgets.each do |widget|
             case widget.type
-            when :auto_complete
-              value = params.delete widget.name
-              params[widget.name.to_s.foreign_key] = nil if value == '' || value == nil
+              when :auto_complete
+              if controlset.collection_config
+                # remove autocomplete text field for new or existing entries
+                a = Toolbox::Helpers.collection_attribute_name(controlset.collection_config, rec)
+                coll = params[a]
+                if coll
+                  coll.each { |p| remove_autocomplete_text p, widget} if coll.is_a? Array
+                  coll.each_key { |p| remove_autocomplete_text p, widget} if coll.is_a? Hash
+                end
+                if rec # may also have new entries...
+                  a = Toolbox::Helpers.collection_attribute_name(controlset.collection_config, nil)
+                  coll = params[a] 
+                  coll.each { |p| remove_autocomplete_text p, widget} if coll
+                end
+              else
+                remove_autocomplete_text params, widget
+              end
             when :date
               #params[widget.name] = Date.strptime(params[widget.name], '%d.%m.%y')
             end
           end
         end
+        puts 'After preprocessing:'
+        puts params.inspect
         params
       end
 
@@ -309,6 +325,11 @@ module Toolbox
 
       private
 
+      def remove_autocomplete_text param, widget
+        value = param.delete widget.name
+        param[widget.name.to_s.foreign_key] = nil if value == '' || value == nil
+      end
+
       def set_record obj
         instance_variable_set "@#{model_name}".to_sym, obj
       end

data/lib/toolbox/helpers.rb

@@ -3,7 +3,7 @@ module Toolbox
   module Helpers
 
     def self.collection_attribute_name collection_config, rec
-      new_or_existing = rec.new_record? ? 'new' : 'existing'
+      new_or_existing = rec && !rec.new_record? ? 'existing' : 'new'
       "#{new_or_existing}_#{collection_config.type.name.to_s.underscore}_attributes"
     end
 

data/lib/toolbox/version.rb

@@ -1,4 +1,4 @@
 
 module Toolbox
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vidl-toolbox
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - David Nyffenegger