inline_forms 1.6.0 → 1.6.1

data/lib/app/assets/stylesheets/inline_forms.css

@@ -124,6 +124,16 @@ a {
     -webkit-border-radius: 5px;
 }
 
+.header {
+    border-bottom: 1px solid #EFCA4B;
+}
+
+.form_element_header {
+    padding-top: 7px;
+    font-size: 120%;
+    font-weight: bolder;
+}
+
 .input_text_field {
     width: 600px;
     height: 1.5em;

data/lib/app/controllers/inline_forms_controller.rb

@@ -61,8 +61,8 @@ class InlineFormsController < ApplicationController
       conditions =  [ "#{foreign_key} = ?", @parent_id ]
     end
     # if we are using cancan, then make sure to select only accessible records
-    @objects = @Klass
-    @objects = @Klass.accessible_by(current_ability) if cancan_enabled?
+    @objects ||= @Klass.accessible_by(current_ability) if cancan_enabled?
+    @objects ||= @Klass
     @objects = @objects.order(@Klass.table_name + "." + @Klass.order_by_clause) if @Klass.respond_to?(:order_by_clause) && ! @Klass.order_by_clause.nil?
     @objects = @objects.paginate(
         :page => params[:page],
@@ -78,7 +78,7 @@ class InlineFormsController < ApplicationController
   # an empty form. After pressing OK or Cancel, the list of objects is retrieved
   # in the same way as :index
   def new
-    @object = @Klass.new
+    @object ||= @Klass.new
     @update_span = params[:update]
     @parent_class = params[:parent_class]
     begin
@@ -109,11 +109,11 @@ class InlineFormsController < ApplicationController
   # :create creates the object made with :new.
   # It then presents the list of objects.
   def create
-    object = @Klass.new
+    @object ||= @Klass.new
     @update_span = params[:update]
-    attributes = @inline_forms_attribute_list || object.inline_forms_attribute_list
+    attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list
     attributes.each do | attribute, name, form_element |
-      send("#{form_element.to_s}_update", object, attribute) unless form_element == :associated
+      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :associated
     end
     @parent_class = params[:parent_class]
     @parent_id = params[:parent_id]
@@ -125,22 +125,22 @@ class InlineFormsController < ApplicationController
     else
       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
+      @object[foreign_key] = @parent_id
     end
-    if object.save
-      flash.now[:success] = t('success', :message => object.class.model_name.human)
+    if @object.save
+      flash.now[:success] = t('success', :message => @object.class.model_name.human)
       @objects = @Klass
       @objects = @Klass.accessible_by(current_ability) if cancan_enabled?
       @objects = @objects.order(@Klass.table_name + "." + @Klass.order_by_clause) if @Klass.respond_to?(:order_by_clause) && ! @Klass.order_by_clause.nil?
       @objects = @objects.paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
+      @object = nil
       respond_to do |format|
         format.js { render :list}
       end
     else
-      flash.now[:header] = ["Kan #{object.class.to_s.underscore} niet aanmaken."]
-      flash.now[:error] = object.errors.to_a
+      flash.now[:header] = ["Kan #{@object.class.to_s.underscore} niet aanmaken."]
+      flash.now[:error] = @object.errors.to_a
       respond_to do |format|
-        @object = object
         @object.inline_forms_attribute_list = attributes
         format.js { render :new}
       end

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

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+# not needed here, since this is only used in the views InlineForms::SPECIAL_COLUMN_TYPES[:header]=:string
+
+def header_show(object, attribute)
+  # show the header which is the translated fake attribute
+  attribute
+end
+
+def header_edit(object, attribute)
+  # just show the header
+  attribute
+end
+
+def header_update(object, attribute)
+  # do absolutely nothing
+end
+

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

@@ -2,15 +2,18 @@
 # not needed here, since this is only used in the views InlineForms::SPECIAL_COLUMN_TYPES[:info]=:string
 
 def info_show(object, attribute)
-  # show the attribute and if it's a date/time, make it nicer.
-  o = object[attribute]
+  # show the attribute. if it's a date/time, make it nicer. If it has a _presentation, show that instead
+  o = object.send(attribute)
   o = o.to_s + " (" + distance_of_time_in_words_to_now(o) + " ago )" if o.is_a?(Time)
+  o = o._presentation if o.respond_to?(:_presentation)
   o
 end
 
 def info_edit(object, attribute)
-  # just show the attribute.
-  object[attribute]
+  o = object.send(attribute)
+  o = o.to_s + " (" + distance_of_time_in_words_to_now(o) + " ago )" if o.is_a?(Time)
+  o = o._presentation if o.respond_to?(:_presentation)
+  o
 end
 
 def info_update(object, attribute)

data/lib/app/helpers/inline_forms_helper.rb

@@ -84,7 +84,7 @@ module InlineFormsHelper
         if parent_class.nil?
           raw out
         else
-          raw out if can? :update, parent_class.find(parent_id).to_s.underscore.to_sym
+          raw out if can? :update, parent_class.find(parent_id) # can update this specific parent object???
         end
       end
     else

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

@@ -15,27 +15,37 @@
   <% attributes.each do | attribute, name, form_element | -%>
     <% if cancan_disabled? || can?(:read, @object, attribute) %>
       <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_#{attribute}" -%>
-      <tr>
-        <td valign="top" class="<%= 'has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="<%= validation_hints_as_list_for(@object, attribute) -%>">
-          <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-            <%= @object.class.human_attribute_name(attribute) -%>
-          </div>
-        </td>
-        <td valign="top">
-          <div class='<%= "attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
-            <span id="<%= css_class_id -%>" >
-              <% if form_element == :associated -%>
-                <%= render  :partial => "inline_forms/list",
-                  :locals => {  :parent_class => @object.class,
-                  :parent_id    => @object.id,
-                  :attribute    => attribute } %>
-              <% else -%>
-                <%= send("#{form_element}_show", @object, attribute) -%>
-              <% end -%>
-            </span>
-          </div>
-        </td>
-      </tr>
+      <% if form_element == :header %>
+        <tr>
+          <td valign="top" class="header" colspan="2">
+            <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+              <%= @object.class.human_attribute_name(attribute) -%>
+            </div>
+          </td>
+        </tr>
+      <% else %>
+        <tr>
+          <td valign="top" class="<%= 'has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="<%= validation_hints_as_list_for(@object, attribute) -%>">
+            <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+              <%= @object.class.human_attribute_name(attribute) -%>
+            </div>
+          </td>
+          <td valign="top">
+            <div class='<%= "attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
+              <span id="<%= css_class_id -%>" >
+                <% if form_element == :associated -%>
+                  <%= render  :partial => "inline_forms/list",
+                    :locals => {  :parent_class => @object.class,
+                    :parent_id    => @object.id,
+                    :attribute    => attribute } %>
+                <% else -%>
+                  <%= send("#{form_element}_show", @object, attribute) -%>
+                <% end -%>
+              </span>
+            </div>
+          </td>
+        </tr>
+      <% end -%>
     <% end -%>
   <% end -%>
 </table>

data/lib/inline_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -232,6 +232,7 @@ files:
 - lib/app/helpers/form_elements/dropdown_with_values.rb
 - lib/app/helpers/form_elements/file_field.rb
 - lib/app/helpers/form_elements/geo_code_curacao.rb
+- lib/app/helpers/form_elements/header.rb
 - lib/app/helpers/form_elements/image_field.rb
 - lib/app/helpers/form_elements/info.rb
 - lib/app/helpers/form_elements/plain_text_area.rb