inline_forms 1.3.40 → 1.3.41

data/lib/app/controllers/inline_forms_controller.rb

@@ -42,8 +42,7 @@ class InlineFormsController < ApplicationController
 
   helper_method :cancan_disabled?, :cancan_enabled?
 
-  load_and_authorize_resource if cancan_enabled?
-
+  load_and_authorize_resource :except => :revert if cancan_enabled?
   # :index shows a list of all objects from class @Klass, using will_paginate,
   # including a link to 'new', that allows you to create a new record.
   def index
@@ -57,7 +56,8 @@ class InlineFormsController < ApplicationController
     if @parent_class.nil?
       conditions = [ @Klass.order_by_clause.to_s + " like ?", "%#{params[:search]}%" ]
     else
-      conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
+      foreign_key = @Klass.first.association(@parent_class.underscore.to_sym).reflection.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
     if cancan_enabled?
@@ -120,11 +120,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.
-    @parent_class.nil? ? conditions = [ @Klass.order_by_clause.to_s + " like ?", "%#{params[:search]}%" ] : conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
-    object[@parent_class.foreign_key] = @parent_id unless @parent_class.nil?
-    puts "BEFORE IF #{object.id} #{object.name}"
+    foreign_key = object.association(@parent_class.underscore.to_sym).reflection.options[:foreign_key] || @parent_class.foreign_key
+    @parent_class.nil? ? conditions = [ @Klass.order_by_clause.to_s + " like ?", "%#{params[:search]}%" ] : conditions =  [ "#{foreign_key} = ?", @parent_id ]
+    object[foreign_key] = @parent_id unless @parent_class.nil?
     if object.save
-    puts "AFTER SAVE IF #{object.id} #{object.name}"
       flash.now[:success] = t('success', :message => object.class.model_name.human)
       if cancan_enabled?
         @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
@@ -134,7 +133,6 @@ class InlineFormsController < ApplicationController
       respond_to do |format|
         format.js { render :list}
       end
-      puts "*)*)*)#{object.id} #{object.name}"
     else
       flash.now[:header] = ["Kan #{object.class.to_s.underscore} niet aanmaken."]
       flash.now[:error] = object.errors.to_a
@@ -209,6 +207,7 @@ class InlineFormsController < ApplicationController
     @version = Version.find(params[:id])
     @version.reify.save!
     @object = @Klass.find(@version.item_id)
+    authorize!(:revert, @object)
     respond_to do |format|
       format.js { render :close }
     end

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

@@ -15,8 +15,12 @@ def dropdown_edit(object, attribute)
   else
     values = o.order(o.order_by_clause)
   end
+  values.each do |v|
+    v.name = v._presentation
+  end
+  values.sort_by! &:name
   # 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)
+  collection_select( ('_' + object.class.to_s.underscore).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', 'name', :selected => object.send(attribute).id)
 end
 
 def dropdown_update(object, attribute)

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

@@ -2,7 +2,7 @@
 InlineForms::SPECIAL_COLUMN_TYPES[:image_field]=:string
 
 def image_field_show(object, attribute)
-  link_to_inline_edit object, attribute, image_tag( object.send(attribute).send(:url) )
+  link_to_inline_edit object, attribute, image_tag(object.send(attribute).send(:palm).send(:url))
 end
 
 def image_field_edit(object, attribute)

data/lib/app/views/inline_forms/_list.html.erb

@@ -38,7 +38,9 @@ they are @object. We need this magic here to rewrite all the @variables to varia
   <% # here we come from _show %>
   <% update_span = "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}_list" -%>
   <% path_to_new='new_' + attribute.to_s.singularize + '_path' %>
-  <% conditions =  [ "#{parent_class.name.foreign_key} = ?", parent_id ] %>
+  <% foreign_key = parent_class.first.association(attribute.to_sym).reflection.options[:foreign_key] || parent_class.name.foreign_key -%>
+
+  <% conditions =  [ "#{foreign_key} = ?", parent_id ] %>
   <% model = attribute.to_s.singularize.camelcase.constantize %>
 
   <% if cancan_enabled? %>

data/lib/inline_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.3.40
+  version: 1.3.41
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm