inline_forms 1.6.63 → 1.6.64

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmE0ZmJlNWEyNjc5ODY0YTdkYjhmNWY1MmFhYjk0OTUzNzhkMjQzYQ==
+    NGYzMTU4NmM5NGQyMGQxMmFmNmQ1YTVhODBmMjQyZmE3OGZhYmZmMA==
   data.tar.gz: !binary |-
-    YjViZGMyYTVkNTIwNTc0NGMxNzYxNjM1NTBmZTRhMzlkM2QxM2IwNQ==
+    ZjQzMzA4OTQxMDQ2ZDUxNmFjODc5MWJmMmQ5NWRhOWM5OTJmMjMxOA==
 SHA512:
   metadata.gz: !binary |-
-    ZTg4YWNlMzhlMDFmNzg2OGIwZDBhMjAwNmY3OThjMzY0MWE2NmZhYTA4ZDg1
-    ZTQyN2RkZGFjNWIxMmUyY2NhMmZkZDM4MjQ2OGZmODY3YzJiOTViOWQyMDIx
-    MDI1YTAwNjZhNjhkZjdlMzk3OWI4N2Y0YWU2MTdjNWQxOWY1YjA=
+    YjdkNzA1ZTM5MWZiNjNlMGE2YzNhMzE0MGFlNmNmZWFkZWM0ODM2ZmM2YTkw
+    NGYzZTlhZDEyMTdlZWE1ZWZkZGUwOGM5MDkwMzE2OTU5OWFjZWIwOTEyODUw
+    NGRlNTllNTVjODZjYWQyYzhkNjc0MjI5ZGI1YjZhOWRkNDBhMzM=
   data.tar.gz: !binary |-
-    NjQyMTdkZDE3YWIzNWQ1ODM3NmFjMDE4N2NjNjU1ZDE2Yzc2Yjc2NDE4MjBh
-    M2QyN2QwMjA0M2Y2MjA5NjFjMmFiNmE4ZTYwNDVkMTU3NDY4MTgxYjYwNjUy
-    M2IzMzkyNjA5ZWM0ZTU0MzdhNDhjNDhmODg3N2Q1ZmE1OWQ1M2Y=
+    ZDk4YzM4NzY5ZTNjNDcxZTUwODVmM2JlODM3ZjgwZmViNDFmNmQzMjVkNmE1
+    MWRlOTgyMTQ0NjRjMzg0ZjgxNzk1MWQyNDEwZjY2Mjk2MTc1NTlkMjQxZGZh
+    ZTA2ZjdjOTcxODAxNDFhMzZhZjMxZTExNTM4NWM4ZjBhZjllZmQ=

data/lib/app/helpers/form_elements/dropdown_with_other.rb

@@ -3,10 +3,11 @@ InlineForms::SPECIAL_COLUMN_TYPES[:dropdown_with_other]=:belongs_to
 
 # dropdown
 def dropdown_with_other_show(object, attribute)
-  foreign_key = object.class.reflect_on_association(attribute.to_sym).options[:foreign_key] || attribute.to_s.foreign_key.to_sym
+  attribute = attribute.to_s
+  foreign_key = object.class.reflect_on_association(attribute.to_sym).options[:foreign_key] || attribute.foreign_key.to_sym
   id = object[foreign_key]
   if id == 0
-    attribute_value = object[attribute.to_s + '_other']
+    attribute_value = object[attribute + '_other']
     attribute_value = "<i class='fi-plus'></i>".html_safe if attribute_value.nil? || attribute_value.empty?
   else
     attribute_value = object.send(attribute)._presentation rescue  "<i class='fi-plus'></i>".html_safe
@@ -15,23 +16,20 @@ def dropdown_with_other_show(object, attribute)
 end
 
 def dropdown_with_other_edit(object, attribute)
-  foreign_key = object.class.reflect_on_association(attribute.to_sym).options[:foreign_key] || attribute.to_s.foreign_key.to_sym
-  #  object.send('build_' + attribute.to_s) unless object.send(attribute)
-  o = attribute.capitalize.constantize
-  if cancan_enabled?
-    values = o.accessible_by(current_ability).order(o.order_by_clause)
-  else
-    values = o.order(o.order_by_clause)
-  end
+  attribute = attribute.to_s
+  foreign_key = object.class.reflect_on_association(attribute.to_sym).options[:foreign_key] || attribute.foreign_key.to_sym
+  o = attribute.camelcase.constantize
+  values = o.all
+  values = o.accessible_by(current_ability) if cancan_enabled?
   values.each do |v|
     v.name = v._presentation
   end
-  values.sort_by! &:name
+  # values.sort_by! &:name
+
   collection = values.map {|v|[v.name, v.id]}
-  collection << [object[attribute.to_s + '_other'], 0] unless object[attribute.to_s + '_other'].nil? || object[attribute.to_s + '_other'].empty?
+  collection << [object[attribute + '_other'], 0] unless object[attribute + '_other'].nil? || object[attribute + '_other'].empty?
   out = '<div class="ui-widget">'
-  out << select('_' + object.class.to_s.underscore, foreign_key.to_sym, collection, {selected: object[foreign_key.to_sym], prompt: 'maake een keuze'}, {id: '_' + object.class.to_s.underscore + '_' + object.id.to_s + '_'  + foreign_key.to_s})
-  #  collection_select( ('_' + object.class.to_s.underscore).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', 'name', :selected => object.send(attribute).id)
+  out << select('_' + object.class.to_s.underscore, foreign_key.to_sym, collection, {selected: object[foreign_key.to_sym]}, {id: '_' + object.class.to_s.underscore + '_' + object.id.to_s + '_'  + foreign_key.to_s})
   out << '</div>
   <script>
     (function( $ ) {
@@ -52,7 +50,7 @@ def dropdown_with_other_edit(object, attribute)
  
         this.input = $( "<input name=\''
         
-    out << '_' + object.class.to_s.underscore + '[' + attribute.to_s + '_other]' 
+    out << '_' + object.class.to_s.underscore + '[' + attribute + '_other]' 
         
         out << '\'>" )
           .appendTo( this.wrapper )
@@ -128,7 +126,7 @@ def dropdown_with_other_edit(object, attribute)
  
   $(function() {
     $( "'
-    out << '#_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + attribute.to_s.foreign_key.to_s 
+    out << '#_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + attribute.foreign_key.to_s 
     out << '" ).combobox();
   });
   </script>'
@@ -138,12 +136,13 @@ def dropdown_with_other_edit(object, attribute)
 end
 
 def dropdown_with_other_update(object, attribute)
-  foreign_key = object.class.reflect_on_association(attribute.to_sym).options[:foreign_key] || attribute.to_s.foreign_key.to_sym
+  attribute = attribute.to_s
+  foreign_key = object.class.reflect_on_association(attribute.to_sym).options[:foreign_key] || attribute.foreign_key.to_sym
   # if there is an attribute attr, then there must be an attribute attr_other
-  other = params[('_' + object.class.to_s.underscore).to_sym][(attribute.to_s + "_other").to_sym]
+  other = params[('_' + object.class.to_s.underscore).to_sym][(attribute + "_other").to_sym]
   # see if it matches anything
-  match = attribute.capitalize.constantize.where(name: other).first # problem if there are dupes!
+  match = attribute.camelcase.constantize.where(name: other).first # problem if there are dupes!
   match.nil? ? object[foreign_key] = 0 : object[foreign_key] = match.id # problem if there is a record with id: 0 !
-  match.nil? ? object[attribute.to_s + '_other'] = other : object[attribute.to_s + '_other'] = nil  
+  match.nil? ? object[attribute + '_other'] = other : object[attribute + '_other'] = nil  
 end
 

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "1.6.63"
+  VERSION = "1.6.64"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.6.63
+  version: 1.6.64
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm