inline_forms 3.0.34 → 3.0.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWE0ZTA0YTYxM2RhMmMzNzM4M2I2OWViNTBkZWM1MTc1NDFmYTlhNA==
+    ZTE0NTA5NjRkMGQ3Y2YzYTViYTJkM2YxMjQ1ZDdhZGJmZTNlZDg3OA==
   data.tar.gz: !binary |-
-    OGQ4OTNhODJiNmJlNDJhZDkyOGUwZjA3YjUwZTA5ZDczNjE5ZjQ1Yg==
+    NWRhNDBhYmY0NGQ1YzZmYTVhZjQ1YTNmMDE1YjI0NzdmNmFmMjE3Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZWM2NmQ2NDNmMzkzMzIyMWE4NjM5NWQ1MTI5NjY2ZWJlOTc0NzA3YjlhYmE5
-    ZjZmNzc1MTEyOTY4OGYyOTc5YWM1N2E3YjU1OTgwZjg0ZGVlYzVlMDZlYjM3
-    N2U3OThhMDk3YjM1ZjMzYTliNzJiY2FjOTQyZmJhYWQ3OGU5Mjk=
+    MThmNTE3NzE1OTY1NDliNjkyZTcxYjBmMzRmOTE4NmU4NDA2MjZjMzBkNGE2
+    NDJjOWU3ZTdkYWMwOTRlYTg0OGVmMWNkOWEyZDU0YmZmNDkxMDkxMDc3ZThh
+    NWU4NzFjM2YzNTYwNDIzOTg4ZjhkMjM0MWMwY2I2YjQ4YjM4NDM=
   data.tar.gz: !binary |-
-    YjRmMGNhNjk5NjViMzhkMmM0NmUwZGVhMWJjMGNmNjJmNGU0NDViM2MxOWM1
-    ZDM4ZjFlOWZmOTdlZjkyOTQyNTJjMmExNzg5ZTNjMzhlMjU3ZjM4NmJjZDY4
-    NmNjNTdhOGFlY2VkZjkzYjVkNmY1ZjE3MDEwYTJmM2M4YmJmMDI=
+    NDhmMmIxZGUwNmVhYzFjMjQxMGMxOTU4NDk5MzA3MmQ2NmFlZmYzNDNlMTFl
+    YjVhZjU2N2RhYmMwNTNjZDNhOTNhOGIyNTJmMTYzMzQ3ZjNhMTUyYzUzZGI3
+    YWUyZjJhYTI1ZjVhODhjYzc5YjFlODdmYWU3YzE5MjdmNDk0Zjg=

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

@@ -3,24 +3,27 @@ InlineForms::SPECIAL_COLUMN_TYPES[:dropdown]=:belongs_to
 
 # dropdown
 def dropdown_show(object, attribute)
-  attribute_value = object.send(attribute)._presentation rescue  "<i class='fi-plus'></i>".html_safe
+  attr = object.send attribute
+  presentation = "_presentation"
+  presentation = "_dropdown_presentation" if attr.respond_to? "_dropdown_presentation"
+  attribute_value = object.send(attribute).send(presentation) rescue  "<i class='fi-plus'></i>".html_safe
   link_to_inline_edit object, attribute, attribute_value
 end
 
 def dropdown_edit(object, attribute)
-  object.send('build_' + attribute.to_s) unless object.send(attribute)
-  o = object.send(attribute).class.name.constantize
+  #object.send('build_' + attribute.to_s) unless object.send(attribute)
+  attr = object.send attribute
+  presentation = "_presentation"
+  presentation = "_dropdown_presentation" if attr.respond_to? "_dropdown_presentation"
+  klass = attribute.to_s.singularize.camelcase.constantize
   if cancan_enabled?
-    values = o.accessible_by(current_ability).order(o.order_by_clause)
+    values = klass.accessible_by(current_ability)
   else
-    values = o.order(o.order_by_clause)
+    values = klass.all
   end
-  values.each do |v|
-    v.name = v._presentation
-  end
-  values.sort_by! &:name
+  values.sort_by! {|v|v.send presentation}
   # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
-  collection_select( ('_' + object.class.to_s.underscore).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', 'name', :selected => object.send(attribute).id)
+  collection_select( ('_' + object.class.to_s.underscore).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', presentation, :selected => (object.send(attribute).id rescue nil) )
 end
 
 def dropdown_update(object, attribute)

data/lib/inline_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 3.0.34
+  version: 3.0.35
 platform: ruby
 authors:
 - Ace Suares