inline_forms 0.6.3 → 0.6.4

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/app/controllers/inline_forms_controller.rb

@@ -122,10 +122,19 @@ class InlineFormsController < ApplicationController
       end
     end
     @update_span = params[:update]
-    respond_to do |format|
-      # found this here: http://www.ruby-forum.com/topic/211467
-      format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element}_show", @object, @field, @values) %>' }
-      }
+    if @field.nil?
+      respond_to do |format|
+        @attributes = @object.respond_to?(:inline_forms_field_list) ? @object.inline_forms_field_list : [ :name, 'name', 'text_field' ]
+        # found this here: http://www.ruby-forum.com/topic/211467
+        format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send( "inline_forms_show_record", @object, @attributes) %>' }
+        }
+      end
+    else
+      respond_to do |format|
+        # found this here: http://www.ruby-forum.com/topic/211467
+        format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element}_show", @object, @field, @values) %>' }
+        }
+      end
     end
   end
 
@@ -134,27 +143,16 @@ class InlineFormsController < ApplicationController
   #
   # DELETE /examples/1
   #
-#  def destroy
-#    #    @@Klass.constantize = @Klass.constantize.find(params[:id])
-#    #    @@Klass.constantize.destroy
-#    redirect_to(@Klass.constantizes_url)
-#  end
+  #  def destroy
+  #    #    @@Klass.constantize = @Klass.constantize.find(params[:id])
+  #    #    @@Klass.constantize.destroy
+  #    redirect_to(@Klass.constantizes_url)
+  #  end
 
   private
-  # If it's not an XhttpRequest, redirect to the index page for this controller.
-  #
-  # Used in before_filter as a way to limit access to all actions (except :index)
-#  def must_be_xhr_request #:doc:
-#    redirect_to "/#{@Klass_pluralized}" if not request.xhr?
-#  end
-
   # Get the class
   # Used in before_filter
   def getKlass #:doc:
     @Klass = self.controller_name.classify.constantize
-    #request.request_uri.split(/[\/?]/)[1].classify
-    #@Klass_constantized = @Klass.constantize
-    #@Klass_underscored = @Klass.underscore
-    #@Klass_pluralized  = @Klass_underscored.pluralize
   end
 end

data/app/helpers/form_elements/associated.rb

@@ -7,7 +7,7 @@ module InlineFormsHelper
     if @sub_id && @sub_id.to_i > 0
       # if it's not a new record (sub_id > 0) then just update the list-element
       out << '<li>'
-      out << link_to( @associated_record.presentation,
+      out << link_to( @associated_record._presentation,
         send('edit_' + @Klass.to_s.underscore + '_path', object,
           :field => attribute,
           :sub_id => @sub_id,
@@ -36,7 +36,7 @@ module InlineFormsHelper
         object.send(attribute.to_s.pluralize).each do |m|
           out << "<span id='field_#{attribute.to_s.singularize}_#{m.id.to_s}'>"
           out << '<li>'
-          out << link_to( m.presentation, send('edit_' + @Klass.to_s.underscore + '_path',
+          out << link_to( m._presentation, send('edit_' + @Klass.to_s.underscore + '_path',
               object,
               :field => attribute,
               :sub_id => m.id,

data/app/helpers/form_elements/dropdown.rb

@@ -2,14 +2,14 @@ module InlineFormsHelper
   InlineForms::SPECIAL_MIGRATION_TYPES[:dropdown]=:integer
   # dropdown
   def dropdown_show(object, attribute, values)
-    attribute_value = object.send(attribute).presentation rescue  nil
+    attribute_value = object.send(attribute)._presentation rescue  nil
     link_to_inline_edit object, attribute, attribute_value, nil
   end
   def dropdown_edit(object, attribute, values)
     object.send('build_' + attribute.to_s) unless object.send(attribute)
     values = object.send(attribute).class.name.constantize.find(:all) # TODO bring order!
     # 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.downcase).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', 'presentation', :selected => object.send(attribute).id)
+    collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', '_presentation', :selected => object.send(attribute).id)
   end
   def dropdown_update(object, attribute, values)
     object[attribute.to_s.foreign_key.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_s.foreign_key.to_sym]

data/app/helpers/form_elements/geo_code_curacao.rb

@@ -2,7 +2,7 @@ module InlineFormsHelper
     InlineForms::SPECIAL_MIGRATION_TYPES[:geo_code_curacao]=:string
   # geo_code_curacao
   def geo_code_curacao_show(object, attribute, values)
-    attribute_value = object.send(attribute).presentation rescue nil
+    attribute_value = object.send(attribute)._presentation rescue nil
     link_to_inline_edit object, attribute, attribute_value, nil
   end
   def geo_code_curacao_edit(object, attribute, values)

data/app/helpers/inline_forms_helper.rb

@@ -5,44 +5,28 @@ Dir[INLINE_FORMS_PATH + "*.rb"].each do |form_element|
 end
 
 module InlineFormsHelper
-  def inline_form(object, attributes) #, collapsed=true)
+  def inline_forms_show_record(object, attributes)
     attributes = [ attributes ] if not attributes[0].is_a?(Array) # make sure we have an array of arrays
-    out = String.new #ugly as hell but that's how content_tag works...
-#    if collapsed
-#      then
-#      name_cell = content_tag :td, :valign=>'top' do
-#        content_tag :div, :class=> "field_name" do
-#          h(object.presentation)
-#        end
-#      end
-#      value_cell = content_tag :td, :valign=>'top' do
-#        content_tag :div, :class=> "field_value" do
-#          link_to 'edit', send( @Klass.to_s.underscore + '_path', object, :update => 'inline_form_list'), :remote => true
-#        end
-#      end
-#      out += content_tag :tr, name_cell + value_cell
-#      out += "\n"
-#    else
-out << h(object._presentation)
-      attributes.each do | attribute, name, form_element, values |
-        #css_class_id = form_element == :associated ? "subform_#{attribute.to_s}_#{object.id}" : "field_#{attribute.to_s}_#{object.id}"
-        css_class_id = "field_#{attribute.to_s}_#{object.id}"
-        name_cell = content_tag :td, :valign=>'top' do
-          content_tag :div, :class=> "field_name field_#{attribute.to_s} form_element_#{form_element.to_s}" do
-            h(name)
-          end
+    out = String.new
+    attributes.each do | attribute, name, form_element, values |
+      #css_class_id = form_element == :associated ? "subform_#{attribute.to_s}_#{object.id}" : "field_#{attribute.to_s}_#{object.id}"
+      css_class_id = "field_#{attribute.to_s}_#{object.id}"
+      name_cell = content_tag :td, :valign=>'top' do
+        content_tag :div, :class=> "field_name field_#{attribute.to_s} form_element_#{form_element.to_s}" do
+          h(name)
         end
-        value_cell = content_tag :td, :valign=>'top' do
-          content_tag :div, :class=> "field_value field_#{attribute.to_s} form_element_#{form_element.to_s}" do
-            content_tag :span, :id => css_class_id do
-              send("#{form_element.to_s}_show", object, attribute, values)
-            end
+      end
+      value_cell = content_tag :td, :valign=>'top' do
+        content_tag :div, :class=> "field_value field_#{attribute.to_s} form_element_#{form_element.to_s}" do
+          content_tag :span, :id => css_class_id do
+            send("#{form_element.to_s}_show", object, attribute, values)
           end
         end
-        out += content_tag :tr, name_cell + value_cell
-        out += "\n"
       end
-#    end
+      out += content_tag :tr, name_cell + value_cell
+      out += "\n"
+    end
+    #    end
     return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
   end
 
@@ -74,8 +58,10 @@ out << h(object._presentation)
   def inline_form_display_list(objects, tag=:li)
     t = ''
     objects.each do |object|
-      t += content_tag tag do
-        inline_form object, object.respond_to?(:inline_forms_field_list) ? object.inline_forms_field_list : [ :name, 'name', 'text_field' ]
+      css_class_id = @Klass.to_s.underscore + '_' + object.id.to_s
+      t += content_tag tag, :id => css_class_id do
+        #inline_forms_show_record object, object.respond_to?(:inline_forms_field_list) ? object.inline_forms_field_list : [ :name, 'name', 'text_field' ]
+        link_to( h( object._presentation ), send( @Klass.to_s.underscore + '_path', object, :update => css_class_id), :remote => true )
       end
     end
     return raw(t)

data/inline_forms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Ace Suares