qm-acts-as-generic-controller 0.1.3 → 0.1.5

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.1.3"
+    gemspec.version = "0.1.5"
     gemspec.files = Rake::FileList.new [ "MIT-LICENSE", "Rakefile", "lib/*", "app/views/generic_controller/*" ]
     gemspec.add_dependency "qui-common-helpers", ">= 0.0.8"
     gemspec.add_dependency "qui-index-table", ">= 0.0.8"

data/app/views/generic_controller/form.erb

@@ -36,38 +36,43 @@
       <li>
         <%= f.label field[:name] %>
         
-        <%- if klass.is_enum?(field[:name]) -%>
-          <%= f.select field[:name], t("activerecord.enums.#{table_name}.#{field[:name]}").collect{|k,v| [v, k.to_s] }.sort{|x,y| x.last.to_i <=> y.last.to_i }, { :selected => params[table_name] ? params[table_name][field[:name]].to_s : f.object.send(field[:name]).to_s }  %>
+        <%- if field[:options].has_key? :renderer -%>
+          <%= send field[:options][:renderer], { :record => record, :field => field, :action => :form, :form => f } -%>
           
-        <%- elsif klass.generic_field_associations[field[:name]] -%>
-          <%- if klass.generic_field_associations[field[:name]][:kind] == :belongs_to -%>
-            <%= multiple_select :kind => :radio, :field => field, :record => record %>
+        <%- else -%>
+          <%- if klass.is_enum?(field[:name]) -%>
+            <%= f.select field[:name], t("activerecord.enums.#{table_name}.#{field[:name]}").collect{|k,v| [v, k.to_s] }.sort{|x,y| x.last.to_i <=> y.last.to_i }, { :selected => params[table_name] ? params[table_name][field[:name]].to_s : f.object.send(field[:name]).to_s }  %>
             
-          <%- elsif klass.generic_field_associations[field[:name]][:kind] == :has_and_belongs_to_many or klass.generic_field_associations[field[:name]][:kind] == :has_many-%>
-            <%= multiple_select :kind => :check, :field => field, :record => record  %>
-
-          <%- end -%>
-          
-        <%- else -%> 
-          <%- case record.column_for_attribute(field[:name]).type -%>
-            <%- when :text -%>
-              <%= f.text_area field[:name], :rows => 5, :cols => 60 %>
-            <%- when :date, :datetime -%>
-              <%= f.calendar_date_select field[:name] %>
-            <%- when :boolean -%>
-              <span class="boolean">
-                <%= f.radio_button field[:name], "1", { :checked => params[table_name] && params[table_name].has_key?(field[:name]) ? params[table_name][field[:name]] == "1" : f.object.send(field[:name]) == true } %><%= f.label field[:name], t(:"genericController.yesAsBooleanOption"), { :for => "#{f.object.class.to_s.tableize.singularize}_#{field[:name]}_1" } %>
-                <%= f.radio_button field[:name], "0", { :checked => params[table_name] && params[table_name].has_key?(field[:name]) ? params[table_name][field[:name]] == "0" : f.object.send(field[:name]) == false } %><%= f.label field[:name], t(:"genericController.noAsBooleanOption"), { :for => "#{f.object.class.to_s.tableize.singularize}_#{field[:name]}_0" } %>
-              </span>
+          <%- elsif klass.generic_field_associations[field[:name]] -%>
+            <%- if klass.generic_field_associations[field[:name]][:kind] == :belongs_to -%>
+              <%= multiple_select :kind => :radio, :field => field, :record => record %>
+              
+            <%- elsif klass.generic_field_associations[field[:name]][:kind] == :has_and_belongs_to_many or klass.generic_field_associations[field[:name]][:kind] == :has_many-%>
+              <%= multiple_select :kind => :check, :field => field, :record => record  %>
 
-            <%- else -%>
+            <%- end -%>
             
-              <%- if record.respond_to?(field[:name]) and record.respond_to?("#{field[:name]}_file_name") and record.respond_to?("#{field[:name]}_content_type") -%>
-                <%= f.file_field field[:name] %>
-              
+          <%- else -%> 
+            <%- case record.column_for_attribute(field[:name]).type -%>
+              <%- when :text -%>
+                <%= f.text_area field[:name], :rows => 5, :cols => 60 %>
+              <%- when :date, :datetime -%>
+                <%= f.calendar_date_select field[:name] %>
+              <%- when :boolean -%>
+                <span class="boolean">
+                  <%= f.radio_button field[:name], "1", { :checked => params[table_name] && params[table_name].has_key?(field[:name]) ? params[table_name][field[:name]] == "1" : f.object.send(field[:name]) == true } %><%= f.label field[:name], t(:"genericController.yesAsBooleanOption"), { :for => "#{f.object.class.to_s.tableize.singularize}_#{field[:name]}_1" } %>
+                  <%= f.radio_button field[:name], "0", { :checked => params[table_name] && params[table_name].has_key?(field[:name]) ? params[table_name][field[:name]] == "0" : f.object.send(field[:name]) == false } %><%= f.label field[:name], t(:"genericController.noAsBooleanOption"), { :for => "#{f.object.class.to_s.tableize.singularize}_#{field[:name]}_0" } %>
+                </span>
+
               <%- else -%>
-                <%= f.text_field field[:name] %>
-              <%- end -%>
+              
+                <%- if record.respond_to?(field[:name]) and record.respond_to?("#{field[:name]}_file_name") and record.respond_to?("#{field[:name]}_content_type") -%>
+                  <%= f.file_field field[:name] %>
+                
+                <%- else -%>
+                  <%= f.text_field field[:name] %>
+                <%- end -%>
+            <%- end -%>
           <%- end -%>
         <%- end -%>
       </li>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +02:00
+date: 2010-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency