inline_forms 0.9.19 → 0.9.20

data/VERSION

@@ -1 +1 @@
-0.9.19
+0.9.20

data/app/controllers/inline_forms_controller.rb

@@ -54,13 +54,14 @@ class InlineFormsController < ApplicationController
     @parent_class = params[:parent_class]
     @parent_id = params[:parent_id]
     @ul_needed = params[:ul_needed]
+    @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
     @parent_class.nil? ? conditions = ["name like ?", "%#{params[:search]}%" ] : conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
     if cancan_enabled?
-      @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate :page => params[:page], :conditions => conditions
+      @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
     else
-      @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :conditions => conditions
+      @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
     end
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
@@ -118,27 +119,32 @@ class InlineFormsController < ApplicationController
     end
     @parent_class = params[:parent_class]
     @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 = ["name like ?", "%#{params[:search]}%" ] : conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
     object[@parent_class.foreign_key] = @parent_id unless @parent_class.nil?
     if object.save
       flash.now[:success] = "Successfully created #{object.class.to_s.underscore}."
+      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
+      else
+        @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
+      end
+      respond_to do |format|
+        # found this here: http://www.ruby-forum.com/topic/211467
+        format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/list'}
+        }
+      end
     else
       flash.now[:error] = "Failed to create #{object.class.to_s.underscore}.".html_safe
       object.errors.each do |e|
         flash.now[:error] << '<br />'.html_safe + e[0].to_s + ": " + e[1]
       end
-    end
-    if cancan_enabled?
-      @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate :page => params[:page], :conditions => conditions
-    else
-      @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :conditions => conditions
-    end
-
-    respond_to do |format|
-      # found this here: http://www.ruby-forum.com/topic/211467
-      format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/list'}
-      }
+      respond_to do |format|
+        @object = object
+        format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/new'}
+        }
+      end
     end
   end
   # :update updates a specific attribute from an object.

data/app/helpers/form_elements/date.rb

@@ -6,10 +6,11 @@ def date_select_show(object, attribute)
 end
 
 def date_select_edit(object, attribute)
-  out = text_field_tag attribute, object[attribute]
+  css_id = 'datepicker_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + attribute.to_s
+  out = text_field_tag attribute, object[attribute], :id => css_id
   out << '<SCRIPT>'.html_safe
   out << "$(function() { ".html_safe
-  out << '$("#'.html_safe + attribute.to_s.html_safe + '").datepicker();'.html_safe
+  out << '$("#'.html_safe + css_id.html_safe + '").datepicker();'.html_safe
   out << '});'.html_safe
   out << '</SCRIPT>'.html_safe
   return out

data/app/helpers/form_elements/datetime.rb

@@ -6,10 +6,11 @@ def datetime_select_show(object, attribute)
 end
 
 def datetime_select_edit(object, attribute)
-  out = text_field_tag attribute, object[attribute]
+  css_id = 'datepicker_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + attribute.to_s
+  out = text_field_tag attribute, object[attribute], :id => css_id
   out << '<SCRIPT>'.html_safe
   out << "$(function() { ".html_safe
-  out << '$("#'.html_safe + attribute.to_s.html_safe + '").datepicker();'.html_safe
+  out << '$("#'.html_safe + css_id.html_safe + '").datepicker();'.html_safe
   out << '});'.html_safe
   out << '</SCRIPT>'.html_safe
   return out

data/app/helpers/inline_forms_helper.rb

@@ -27,29 +27,29 @@ module InlineFormsHelper
     attribute_value << "&nbsp;".html_safe * spaces
     css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
     if cancan_disabled? || ( can? :update, object )
-    link_to attribute_value,
-      send( 'edit_' + object.class.to_s.underscore + '_path',
-      object,
-      :attribute => attribute.to_s,
-      :form_element => calling_method.sub(/_[a-z]+$/,''),
-      :update => css_class_id ),
-      :remote => true
+      link_to attribute_value,
+        send( 'edit_' + object.class.to_s.underscore + '_path',
+        object,
+        :attribute => attribute.to_s,
+        :form_element => calling_method.sub(/_[a-z]+$/,''),
+        :update => css_class_id ),
+        :remote => true
     else
-    attribute_value
+      attribute_value
     end
   end
 
   # link to inline image edit
-  def link_to_inline_image_edit(object, attribute)
-    text= image_tag object.send(attribute).send('url', :thumb)
-    link_to text,
-      send('edit_' + @Klass.to_s.underscore + '_path',
-      object,
-      :attribute => attribute.to_s,
-      :form_element => calling_method.sub(/_[a-z]+$/,''),
-      :update => "attribute_#{attribute}_#{object.id}" ),
-      :remote => true
-  end
+  #  def link_to_inline_image_edit(object, attribute)
+  #    text= image_tag object.send(attribute).send('url', :thumb)
+  #    link_to text,
+  #      send('edit_' + @Klass.to_s.underscore + '_path',
+  #      object,
+  #      :attribute => attribute.to_s,
+  #      :form_element => calling_method.sub(/_[a-z]+$/,''),
+  #      :update => "attribute_#{attribute}_#{object.id}" ),
+  #      :remote => true
+  #  end
 
   def link_to_new_record(text, model, path_to_new, update_span, parent_class, parent_id)
     out = ""
@@ -57,10 +57,17 @@ module InlineFormsHelper
     out << (link_to text, send(path_to_new, :update => update_span, :parent_class => parent_class, :parent_id => parent_id ), :remote => true)
     out << "</li>"
     ""
-    raw out if cancan_disabled? || ( can? :manage, parent_class.nil? ? Client : parent_class.find(parent_id) )
+    if cancan_enabled?
+      if can?(:manage, model.constantize)
+        if parent_class.nil?
+          raw out
+        else
+          raw out if can?(:update, parent_class.find(parent_id))
+        end
+      end
+    end
   end
 
-
   # get the values for an attribute
   #
   # values should be a Hash { integer => string, ... }

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

@@ -1,5 +1,9 @@
 <% flash.each do |key, value| %>
   <div id="flash" class="flash <%= key %>"><%= value %></div>
+  <script type="text/javascript">
+    $(function() { $("#flash").delay(1000).fadeToggle('2000'); } );
+  </script>
+
 <% end %>
 
 <!-- purpose: list objects. we come here from #index and from #new.
@@ -26,7 +30,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
     <% update_span = "#{@parent_class.to_s.underscore}_#{@parent_id}_#{attribute}_list" -%>
     <% human_readable_class= attribute.to_s.singularize.humanize.downcase %>
     <% path_to_new='new_' + attribute.to_s.underscore.singularize + '_path' %>
-    <% parent_class=@parent_class %>
+    <% parent_class=@parent_class.constantize %>
     <% parent_id=@parent_id %>
     <% objects = @objects %>
     <% ul_needed = false unless @ul_needed %>
@@ -39,9 +43,9 @@ they are @object. We need this magic here to rewrite all the @variables to varia
   <% conditions =  [ "#{parent_class.name.foreign_key} = ?", parent_id ] %>
 
   <% if cancan_enabled? %>
-    <% objects = parent_class.find(parent_id).send(attribute).accessible_by(current_ability).order(attribute.to_s.singularize.camelcase.constantize.order_by_clause).paginate  :page => params[:page], :conditions => conditions %>
+    <% objects = parent_class.find(parent_id).send(attribute).accessible_by(current_ability).order(attribute.to_s.singularize.camelcase.constantize.order_by_clause).paginate  :page => params[:page], :per_page => @PER_PAGE || 5, :conditions => conditions %>
   <% else %>
-    <% objects = parent_class.find(parent_id).send(attribute).order(attribute.to_s.singularize.camelcase.constantize.order_by_clause).paginate :page => params[:page], :conditions => conditions %>
+    <% objects = parent_class.find(parent_id).send(attribute).order(attribute.to_s.singularize.camelcase.constantize.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 5, :conditions => conditions %>
   <% end %>
 
 <% end %>
@@ -66,11 +70,14 @@ they are @object. We need this magic here to rewrite all the @variables to varia
         :remote => true -%>
     </li>
   <% end -%>
-  <%  if parent_id.nil? -%>
-    <%= will_paginate objects -%>
-  <% else %>
-    <%= will_paginate objects, :ajax => true, :params => {:controller => attribute, :action => :index, :id => nil, :parent_class => parent_class, :parent_id => parent_id, :update => "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}", :ul_needed => true  } -%>
-  <% end %>
+  <!--  # pagination -->
+  <li class="even">
+    <%  if parent_id.nil? -%>
+      <%= will_paginate objects -%>
+    <% else %>
+      <%= will_paginate objects, :ajax => true, :params => {:controller => attribute, :action => :index, :id => nil, :parent_class => parent_class, :parent_id => parent_id, :update => "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}", :ul_needed => true  } -%>
+    <% end %>
+  </li>
   <% if ul_needed %>
   </ul>
 <% end %>

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

@@ -1,47 +1,56 @@
-<li>
-<% form_tag  send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
-                                                              :parent_class => @parent_class,
-                                                              :parent_id => @parent_id ),
-  :multipart => true, :remote => true, :class  => "edit_form"  do -%>
-  <div class="edit_form_field">
-    <table cellspacing="0" cellpadding="0">
-      <tr>
-        <th colspan="2" valign="top">
-          <div class="object_presentation" >
-            Add a new <%= @object.class.to_s.singularize.downcase -%>
-          </div>
-        </th>
-      </tr>
-      <% attributes ||= @object.inline_forms_attribute_list -%>
-      <% attributes.each do | attribute, name, form_element | -%>
-        <% unless form_element.to_sym == :associated -%>
-          <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
-          <tr>
-            <td valign="top">
-              <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-                <%= h(name) -%>
-              </div>
-            </td>
-            <td valign="top">
-              <div class='<%= "attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
-                <span id="<%= css_class_id -%>" >
-                  <%= send("#{form_element}_edit", @object, attribute) -%>
-                </span>
-              </div>
-            </td>
-          </tr>
+<li id="newnew">
+  <% flash.each do |key, value| %>
+    <div id="flash" class="flash <%= key %>"><%= value %></div>
+  <% end %>
+  <script type="text/javascript">
+    $(function() { $("#flash").delay(1000).fadeTo('slow', 0.33); } );
+  </script>
+  <% form_tag  send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
+    :parent_class => @parent_class,
+    :parent_id => @parent_id ),
+    :multipart => true, :remote => true, :class  => "edit_form"  do -%>
+    <div class="edit_form_field">
+      <table cellspacing="0" cellpadding="0">
+        <tr>
+          <th colspan="2" valign="top">
+            <div class="object_presentation" >
+              Add a new <%= @object.class.to_s.singularize.downcase -%>
+            </div>
+          </th>
+        </tr>
+        <% attributes ||= @object.inline_forms_attribute_list -%>
+        <% attributes.each do | attribute, name, form_element | -%>
+          <% unless form_element.to_sym == :associated -%>
+            <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
+            <tr>
+              <td valign="top">
+                <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+                  <%= h(name) -%>
+                </div>
+              </td>
+              <td valign="top">
+                <div class='<%= "attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
+                  <span id="<%= css_class_id -%>" >
+                    <%= send("#{form_element}_edit", @object, attribute) -%>
+                  </span>
+                </div>
+              </td>
+            </tr>
+          <% end -%>
         <% end -%>
-      <% end -%>
-    </table>
-  </div>
-  <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
-                                                                :parent_class => @parent_class,
-                                                                :parent_id => @parent_id ),
-    :remote => true,
-    :class  => "edit_form_cancel" ) do  %>
-    <input type="button" name="cancel" value="cancel" />
+      </table>
+    </div>
+    <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
+        :parent_class => @parent_class,
+        :parent_id => @parent_id ),
+      :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 %>
-  <%= submit_tag "ok", :class => "edit_form_submit"-%>
-  <div style="clear: both;"></div>
-<% end %>
-</li>
+</li>
+  <script type="text/javascript">
+    $(function() { $("#newnew").slideDown(4000); } );
+  </script>

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

@@ -1,4 +1,4 @@
-<table cellspacing="0" cellpadding="0">
+<table cellspacing="0" cellpadding="0" style="height: 0">
   <tr>
     <th valign="top">
       <div class="object_presentation" >

data/app/views/layouts/inline_forms.rhtml

@@ -25,6 +25,8 @@
   <body>
     <%= render "inline_forms/header" %>
     <%= render "/inline_forms_tabs" %>
-    <%= yield %>
+    <div id="inline_forms_main_list">
+      <%= yield %>
+    </div>
   </body>
 </html>

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.9.19"
+  s.version = "0.9.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-06-21}
+  s.date = %q{2011-06-28}
   s.description = %q{Inline Forms aims to ease the setup of forms that provide inline editing. The field list can be specified in the model.}
   s.email = %q{ace@suares.an}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 9
-  - 19
-  version: 0.9.19
+  - 20
+  version: 0.9.20
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 -04:00
+date: 2011-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency