inline_forms 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/app/controllers/inline_forms_controller.rb

@@ -31,23 +31,7 @@ class InlineFormsController < ApplicationController
     end
   end
 
-  # :show shows one field (attribute) from a record (object). It inludes the link to 'edit'
-  #
-  # GET /examples/1?field=name&form_element=text
-  #
-#  def show
-#    @object = @Klass.constantize.find(params[:id])
-#    @field = params[:field]
-#    @form_element = params[:form_element]
-#    if @form_element == "associated"
-#      @sub_id = params[:sub_id]
-#      if @sub_id.to_i > 0
-#        @associated_record_id = @object.send(@field.singularize + "_ids").index(@sub_id.to_i)
-#        @associated_record = @object.send(@field)[@associated_record_id]
-#      end
-#    end
-#    render :inline => '<%= send("#{@form_element}_show", @object, @field, @values) %>'
-#  end
+  
 
   # :new prepares a new object, updates the entire list of objects and replaces it with a new
   # empty form. After pressing OK or Cancel, the list of objects is retrieved in the same way as :index
@@ -119,7 +103,29 @@ class InlineFormsController < ApplicationController
       format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element.to_s}_show", @object, @field, @values) %>' }
       }
     end
-      
+  end
+
+  # :show shows one field (attribute) from a record (object). It inludes the link to 'edit'
+  #
+  # GET /examples/1?field=name&form_element=text
+  #
+  def show
+    @object = @Klass.find(params[:id])
+    @field = params[:field]
+    @form_element = params[:form_element]
+    if @form_element == "associated"
+      @sub_id = params[:sub_id]
+      if @sub_id.to_i > 0
+        @associated_record_id = @object.send(@field.singularize + "_ids").index(@sub_id.to_i)
+        @associated_record = @object.send(@field)[@associated_record_id]
+      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) %>' }
+      }
+    end
   end
 
   # :destroy is not implemented

data/app/helpers/inline_forms_helper.rb

@@ -27,27 +27,25 @@ module InlineFormsHelper
     when :new
       attributes.each do | name, attribute, 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)
+        if not form_element.to_sym == :associated
+          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
           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
-              if not form_element == :associated
+          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}_edit", object, attribute, values)
-              else
-                #send("#{form_element.to_s}_show", object, attribute, values)
               end
             end
           end
+          out += content_tag :tr, name_cell + value_cell
         end
-        out += content_tag :tr, name_cell + value_cell
       end
-      return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
     end
+    return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
   end
   # display a list of objects
   def inline_form_display_list(objects, tag=:li)
@@ -71,7 +69,7 @@ module InlineFormsHelper
   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, :order => 'name ASC')
+    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)
   end
@@ -160,7 +158,7 @@ module InlineFormsHelper
   end
   def checklist_edit(object, attribute, values)
     object.send(attribute).build  if object.send(attribute).empty?
-    values = object.send(attribute).first.class.name.constantize.find(:all, :order => "name ASC")
+    values = object.send(attribute).first.class.name.constantize.find(:all) # TODO bring order
     out = '<div class="edit_form_checklist">'
     out << '<ul>'
     values.each do | item |
@@ -188,14 +186,13 @@ module InlineFormsHelper
       # if it's not a new record (sub_id > 0) then just update the list-element
       out << '<li>'
       out << link_to( @associated_record.title,
-        :url => { :action => 'edit',
-          :id => object.id,
+        send('edit_' + @Klass.to_s.underscore + '_path', object,
           :field => attribute,
           :sub_id => @sub_id,
           :form_element => this_method.reverse.sub(/.*_/,'').reverse,
-          :values => values },
+          :values => values,
+          :update => "field_#{attribute.singularize}_#{@sub_id.to_s}" ),
         :method => :get,
-        :update => "field_#{attribute.singularize}_#{@sub_id.to_s}",
         :remote => true )
       out << '</li>'
     else
@@ -206,15 +203,14 @@ module InlineFormsHelper
         object.send(attribute.pluralize).each do |m|
           out << "<span id='field_#{attribute.singularize}_#{m.id.to_s}'>"
           out << '<li>'
-          out << link_to( m.title,
-            :url => { :action => 'edit',
-              :id => object.id,
+          out << link_to( m.title, send('edit_' + @Klass.to_s.underscore + '_path',
+              object,
               :field => attribute,
               :sub_id => m.id,
               :form_element => this_method.sub(/_[a-z]+$/,''),
-              :values => values },
+              :values => values,
+              :update => "field_#{attribute.singularize}_#{m.id.to_s}" ),
             :method => :get,
-            :update => "field_#{attribute.singularize}_#{m.id.to_s}",
             :remote => true )
           out << '</li>'
           out << '</span>'
@@ -222,23 +218,22 @@ module InlineFormsHelper
       end
       # add a 'new' link for creating a new record
       out << '<li>'
-      out << link_to( 'new',
-        :url => { :action => 'edit',
-          :id => object.id,
+      out << link_to( 'new', send('edit_' + @Klass.to_s.underscore + '_path',
+          object,
           :field => attribute,
           :sub_id => 0,
           :form_element => this_method.sub(/_[a-z]+$/,''),
-          :values => values },
+          :values => values,
+          :update => "list_#{attribute}_#{object.id.to_s}" ),
         :method => :get,
-        :update => "list_#{attribute}_#{object.id.to_s}",
         :remote => true )
       out << '</li>'
       out << '</ul>' if @sub_id.nil?
     end
-    out
+    raw(out)
   end
   def associated_edit(object, attribute, values)
-    # @sub_id is the id of the assoicated record
+    # @sub_id is the id of the associated record
     if @sub_id.to_i > 0
       # only if @sub_id > 0, means we have a associated record
       @associated_record_id = object.send(attribute.singularize + "_ids").index(@sub_id.to_i)
@@ -248,9 +243,9 @@ module InlineFormsHelper
       # but if @sub_id = 0, then we are dealing with a new associated record
       # in that case, we .new a record, and the update_span is the whole <ul>
       @associated_record = attribute.singularize.capitalize.constantize.new
-      @update_span = "list_#{attribute}_#{object.id.to_s}"
+      @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
     end
-    render :partial => "subform"
+    render :partial => "inline_forms/subform"
   end
   def associated_update(object, attribute, values)
     return if object.id.nil?
@@ -262,10 +257,10 @@ module InlineFormsHelper
     else
       # create a new associated record
       @associated_record = object.send(attribute.to_sym).new
-      @update_span = 'list_#{attribute}_#{object.id.to_s}'
+      @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
     end
     # process the sub_form fields (attributes). These are declared in the model!
-    @associated_record.field_list.each do | @subform_description, @subform_field, @subform_element |
+    @associated_record.inline_forms_field_list.each do | @subform_description, @subform_field, @subform_element |
       # have no fear
       send("#{@subform_element}_update", @associated_record, @subform_field, nil)
     end

data/app/views/inline_forms/_edit.html.erb

@@ -4,20 +4,23 @@
   :form_element => @form_element,
   :values => @values,
   :sub_id => @sub_id ),
-  :method => :put,
+  :method => :put, # this is going to the update method!
 :multipart => true,
   :class  => "edit_form",
   :remote => true do -%>
   <div class="edit_form_field">
     <%= send("#{@form_element.to_s}_edit", @object, @field, @values) %>
   </div>
-  <%= link_to "nee", send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span || "field_#{@field}_#{@object.id.to_s}",
-    :field => @field,
-    :form_element => @form_element,
-    :values => @values,
-    :sub_id => @sub_id ),
-    :method => :get,
-    :class  => "edit_form_cancel" %>
+  <%= link_to( send( @Klass.to_s.underscore + '_path', :update => @update_span || "field_#{@field}_#{@object.id.to_s}",
+      :field => @field,
+      :form_element => @form_element,
+      :values => @values,
+      :sub_id => @sub_id ),
+    :method => :get, # this is going to the show method!
+    :class  => "edit_form_cancel",
+    :remote => true ) do %>
+    <input type="button" name="cancel" value="cancel" />
+  <% end %>
   <%= submit_tag "ok", :class => "edit_form_submit"-%>
   <div style="clear: both;"></div>
 <% end -%>

data/app/views/inline_forms/_new.html.erb

@@ -3,8 +3,10 @@
   <div class="edit_form_field">
     <%= inline_form_display(@object, @object.respond_to?(:inline_forms_field_list) ? @object.inline_forms_field_list : [ '', :name, :text ], :new) %>
   </div>
-  <%= link_to "nee", send(@Klass.to_s.underscore.pluralize + '_path',:update => @update_span), :remote => true,
-    :class  => "edit_form_cancel"  %>
+  <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path',:update => @update_span || 'inline_form_list'), :remote => true,
+    :class  => "edit_form_cancel" ) do  %>
+    <input type="button" name="cancel" value="cancel" />
+<% end %>
   <%= submit_tag "ok", :class => "edit_form_submit"-%>
   <div style="clear: both;"></div>
 <% end -%>

data/app/views/inline_forms/_subform.html.erb

@@ -1,5 +1,5 @@
 <table cellpadding="0" cellspacing="0" class="subform">
-  <% @associated_record.field_list.each do | @subform_description, @subform_field, @subform_element, @values | %>
+  <% @associated_record.inline_forms_field_list.each do | @subform_description, @subform_field, @subform_element, @values | %>
     <tr>
       <td valign="top">
         <div class="subform_field-name">

data/inline_forms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Ace Suares