inline_forms 0.9.7 → 0.9.8

data/README.rdoc

@@ -7,7 +7,7 @@ Ever tired of setting up forms to manage your data? Inline Forms aims at quick a
 Look in the generator files for a hint about usage. In short:
  rails g inline_forms Person first_name:string last_name:string age:dropdown_with_integers
 will create a model, a migration an a controller. In the model you would only have to add 
-values for the dropdown, or instance 12..45.
+values for the dropdown, for instance 12..45.
 In going to /persons you would see a nice form to add and edit persons.
 
 It's work in progress.

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.8

data/app/controllers/inline_forms_controller.rb

@@ -53,11 +53,12 @@ class InlineFormsController < ApplicationController
     update_span = params[:update]
     @parent_class = params[:parent_class]
     @parent_id = params[:parent_id]
+    @ul_needed = params[:ul_needed]
     @parent_class.nil? ? conditions = [] : conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
     if cancan_enabled?
-      @objects = @Klass.accessible_by(current_ability).paginate :page => params[:page], :order => 'created_at DESC', :conditions => conditions
+      @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate :page => params[:page], :conditions => conditions
     else
-      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC', :conditions => conditions
+      @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :conditions => conditions
     end
 
     respond_to do |format|
@@ -124,9 +125,9 @@ class InlineFormsController < ApplicationController
     @parent_id = params[:parent_id]
     @parent_class.nil? ? conditions = [] : conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
     if cancan_enabled?
-      @objects = @Klass.accessible_by(current_ability).paginate :page => params[:page], :order => 'created_at DESC', :conditions => conditions
+      @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate :page => params[:page], :conditions => conditions
     else
-      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC', :conditions => conditions
+      @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :conditions => conditions
     end
 
     respond_to do |format|

data/app/helpers/form_elements/check_list.rb

@@ -16,9 +16,9 @@ end
 def check_list_edit(object, attribute)
   object.send(attribute).build  if object.send(attribute).empty?
   if cancan_enabled?
-    values = object.send(attribute).first.class.name.constantize.accessible_by(current_ability) # TODO bring order!
+    values = object.send(attribute).first.class.name.constantize.accessible_by(current_ability).order(@Klass.order_by_clause)
   else
-    values = object.send(attribute).first.class.name.constantize.all # TODO bring order!
+    values = object.send(attribute).first.class.name.constantize.order(@Klass.order_by_clause)
   end
   out = '<div class="edit_form_checklist">'
   out << '<ul>'

data/app/helpers/form_elements/dropdown.rb

@@ -9,9 +9,9 @@ end
 def dropdown_edit(object, attribute)
   object.send('build_' + attribute.to_s) unless object.send(attribute)
   if cancan_enabled?
-    values = object.send(attribute).class.name.constantize.accessible_by(current_ability) # TODO bring order!
+    values = object.send(attribute).class.name.constantize.accessible_by(current_ability).order(@Klass.order_by_clause)
   else
-    values = object.send(attribute).class.name.constantize.all # TODO bring order!
+    values = object.send(attribute).class.name.constantize.order(@Klass.order_by_clause)
   end
   # 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)

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

@@ -29,14 +29,21 @@ they are @object. We need this magic here to rewrite all the @variables to varia
     <% parent_class=@parent_class %>
     <% parent_id=@parent_id %>
     <% objects = @objects %>
-    <% ul_needed = false %>
+    <% ul_needed = false unless @ul_needed %>
   <% end %>
 <% else %>
   <% # here we come from _show %>
   <% 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.singularize + '_path' %>
-  <% objects = parent_class.find(parent_id).send(attribute) %>
+  <% conditions =  [ "#{parent_class.name.foreign_key} = ?", parent_id ] %>
+
+  <% if cancan_enabled? %>
+    <% objects = parent_class.find(parent_id).send(attribute).accessible_by(current_ability).order(@Klass.order_by_clause).paginate  :page => params[:page], :conditions => conditions %>
+  <% else %>
+    <% objects = parent_class.find(parent_id).send(attribute).order(@Klass.order_by_clause).paginate :page => params[:page], :conditions => conditions %>
+  <% end %>
+
 <% end %>
 
 <% if ul_needed %>
@@ -59,6 +66,11 @@ 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 %>
   <% if ul_needed %>
   </ul>
 <% end %>

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.9.7"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-05-25}
+  s.date = %q{2011-05-29}
   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: 53
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -04:00
+date: 2011-05-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency