inline_forms 0.9.22 → 0.9.23

data/VERSION

@@ -1 +1 @@
-0.9.22
+0.9.23

data/app/helpers/form_elements/infoadmin.rb

@@ -0,0 +1,22 @@
+# FIXME not needed here, since this is only used in the views InlineForms::SPECIAL_COLUMN_TYPES[:info]=:string
+
+def infoadmin_show(object, attribute)
+  object.send(attribute)._presentation rescue  ''
+end
+
+def infoadmin_edit(object, attribute)
+  object.send('build_' + attribute.to_s) unless object.send(attribute)
+  o = object.send(attribute).class.name.constantize
+  if cancan_enabled?
+    values = o.accessible_by(current_ability).order(o.order_by_clause)
+  else
+    values = o.order(o.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)
+end
+
+def infoadmin_update(object, attribute)
+  object[attribute.to_s.foreign_key.to_sym] = params[('_' + object.class.to_s.underscore).to_sym][attribute.to_s.foreign_key.to_sym]
+end
+

data/app/helpers/inline_forms_helper.rb

@@ -58,7 +58,7 @@ module InlineFormsHelper
     out << "</li>"
     ""
     if cancan_enabled?
-      if can?(:manage, model.constantize)
+      if can?(:create, model.constantize)
         if parent_class.nil?
           raw out
         else

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

@@ -24,6 +24,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
     <% parent_class = nil %>
     <% parent_id = nil  %>
     <% objects = @objects %>
+    <% model_name = @Klass.to_s %>
   <% else %>
     <% # the controller gave us an @parent_class, so ... %>
     <% attribute = @Klass.to_s.underscore.pluralize %>
@@ -34,6 +35,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
     <% parent_id=@parent_id %>
     <% objects = @objects %>
     <% ul_needed = false unless @ul_needed %>
+    <% model_name = attribute.to_s.singularize.camelcase %>
   <% end %>
 <% else %>
   <% # here we come from _show %>
@@ -41,6 +43,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
   <% human_readable_class = attribute.to_s.singularize.humanize.downcase %>
   <% path_to_new='new_' + attribute.to_s.singularize + '_path' %>
   <% conditions =  [ "#{parent_class.name.foreign_key} = ?", parent_id ] %>
+  <% model_name = attribute.to_s.singularize.camelcase %>
 
   <% 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], :per_page => @PER_PAGE || 5, :conditions => conditions %>
@@ -54,7 +57,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
   <ul id="<%= update_span -%>" class="inline_forms_list">
   <% end %>
   <!--  # link to new -->
-  <%= link_to_new_record("Add a new #{human_readable_class}", objects.first.class.name, path_to_new, update_span, parent_class, parent_id) -%>
+  <%= link_to_new_record("Add a new #{human_readable_class}", model_name, path_to_new, update_span, parent_class, parent_id) -%>
   <!--  # list of objects -->
   <% for object in objects %>
     <% if parent_class.nil?  %>

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.9.22"
+  s.version = "0.9.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-07-17}
+  s.date = %q{2011-07-31}
   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 = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "app/helpers/form_elements/geo_code_curacao.rb",
     "app/helpers/form_elements/image.rb",
     "app/helpers/form_elements/info.rb",
+    "app/helpers/form_elements/infoadmin.rb",
     "app/helpers/form_elements/question_list.rb",
     "app/helpers/form_elements/scale_with_integers.rb",
     "app/helpers/form_elements/scale_with_values.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 9
-  - 22
-  version: 0.9.22
+  - 23
+  version: 0.9.23
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 -04:00
+date: 2011-07-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,6 +136,7 @@ files:
 - app/helpers/form_elements/geo_code_curacao.rb
 - app/helpers/form_elements/image.rb
 - app/helpers/form_elements/info.rb
+- app/helpers/form_elements/infoadmin.rb
 - app/helpers/form_elements/question_list.rb
 - app/helpers/form_elements/scale_with_integers.rb
 - app/helpers/form_elements/scale_with_values.rb