inline_forms 1.4.6 → 1.4.7

data/lib/app/controllers/inline_forms_controller.rb

@@ -53,10 +53,10 @@ class InlineFormsController < ApplicationController
     @PER_PAGE = 5 unless @parent_class.nil?
     # if the parent_class is not nill, we are in associated list and we don't search there.
     # also, make sure the Model that you want to do a search on has a :name attribute. TODO
-    if @parent_class.nil?
+    if @parent_class.nil? || @Klass.reflect_on_association(@parent_class.underscore.to_sym).nil?
       conditions = [ @Klass.to_s.tableize + "." + @Klass.order_by_clause + " like ?", "%#{params[:search]}%" ]
     else
-      foreign_key = @Klass.first.association(@parent_class.underscore.to_sym).reflection.options[:foreign_key] || @parent_class.foreign_key
+      foreign_key = @Klass.reflect_on_association(@parent_class.underscore.to_sym).options[:foreign_key] || @parent_class.foreign_key
       conditions =  [ "#{foreign_key} = ?", @parent_id ]
     end
     # if we are using cancan, then make sure to select only accessible records
@@ -84,10 +84,12 @@ class InlineFormsController < ApplicationController
     @object = @Klass.new
     @update_span = params[:update]
     @parent_class = params[:parent_class]
-    unless @parent_class.nil?
+    begin
       @parent_id = params[:parent_id]
-      @object[@parent_class.foreign_key] = @parent_id
-    end
+      foreign_key = @Klass.reflect_on_association(@parent_class.underscore.to_sym).options[:foreign_key] || @parent_class.foreign_key
+      @object[foreign_key] = @parent_id
+    end unless @parent_class.nil? || @Klass.reflect_on_association(@parent_class.underscore.to_sym).nil?
+
     @object.inline_forms_attribute_list = @inline_forms_attribute_list if @inline_forms_attribute_list
     respond_to do |format|
       format.js { }
@@ -120,10 +122,10 @@ class InlineFormsController < ApplicationController
     @parent_id = params[:parent_id]
     @PER_PAGE = 5 unless @parent_class.nil?
     # for the logic behind the :conditions see the #index method.
-    if @parent_class.nil?
+    if @parent_class.nil? || @Klass.reflect_on_association(@parent_class.underscore.to_sym).nil?
       conditions = [ @Klass.to_s.tableize + "." + @Klass.order_by_clause + " like ?", "%#{params[:search]}%" ]
     else
-      foreign_key = object.association(@parent_class.underscore.to_sym).reflection.options[:foreign_key] || @parent_class.foreign_key
+      foreign_key = @Klass.reflect_on_association(@parent_class.underscore.to_sym).options[:foreign_key] || @parent_class.foreign_key
       conditions =  [ "#{foreign_key} = ?", @parent_id ]
       object[foreign_key] = @parent_id
     end

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

@@ -24,7 +24,7 @@ def dropdown_edit(object, attribute)
 end
 
 def dropdown_update(object, attribute)
-  foreign_key = object.association(attribute.to_sym).reflection.options[:foreign_key] || attribute.to_s.foreign_key.to_sym
+  foreign_key = object.class.reflect_on_association(attribute.to_sym).options[:foreign_key] || attribute.to_s.foreign_key.to_sym
   object[foreign_key] = params[('_' + object.class.to_s.underscore).to_sym][attribute.to_s.foreign_key.to_sym]
 end
 

data/lib/inline_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -202,7 +202,6 @@ files:
 - lib/app/helpers/form_elements/geo_code_curacao.rb
 - lib/app/helpers/form_elements/image_field.rb
 - lib/app/helpers/form_elements/info.rb
-- lib/app/helpers/form_elements/infoadmin.rb
 - lib/app/helpers/form_elements/plain_text_area.rb
 - lib/app/helpers/form_elements/question_list.rb
 - lib/app/helpers/form_elements/radio_button.rb

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

@@ -1,23 +0,0 @@
-# -*- encoding : utf-8 -*-
-# FIXME not needed here, since this is only used in the views InlineForms::SPECIAL_COLUMN_TYPES[:info]=:string
-
-def infoadmin_show(object, attribute)
-  object.send(attribute)._presentation rescue  ''
-end
-
-def infoadmin_edit(object, attribute)
-  object.send('build_' + attribute.to_s) unless object.send(attribute)
-  o = object.send(attribute).class.name.constantize
-  if cancan_enabled?
-    values = o.accessible_by(current_ability).order(o.order_by_clause)
-  else
-    values = o.order(o.order_by_clause)
-  end
-  # 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', '_presentation', :selected => object.send(attribute).id)
-end
-
-def infoadmin_update(object, attribute)
-  object[attribute.to_s.foreign_key.to_sym] = params[('_' + object.class.to_s.underscore).to_sym][attribute.to_s.foreign_key.to_sym]
-end
-