qm-acts-as-generic-controller 0.0.7 → 0.0.8

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.0.7"
+    gemspec.version = "0.0.8"
     gemspec.files = Rake::FileList.new [ "MIT-LICENSE", "Rakefile", "lib/*", "app/views/generic_controller/*" ]
     gemspec.add_dependency "qui-common-helpers", ">= 0.0.6"
     gemspec.add_dependency "rfc822"

data/app/views/generic_controller/_index_table.erb

@@ -0,0 +1,31 @@
+<%- records ||= instance_variable_get("@#{@controller.class.to_s.demodulize.gsub("Controller", "").tableize}") -%>
+<%- class_name ||= @controller.class.to_s.demodulize.gsub("Controller", "").singularize.constantize -%>
+
+<%- headers = class_name.generic_fields.collect{|x| x.is_a?(Hash) ? ".#{x.keys.first}".to_sym : ".#{x}".to_sym} -%>
+<%- controller_name = "#{defined?(section) ? "#{section.to_s.camelize}::" : ""}#{class_name.to_s.pluralize}".tableize %>
+<%- has_edit = ActionController::Routing::Routes.routes.collect{|x| x if x.matches_controller_and_action?(controller_name, "edit") }.compact.size > 0 %>
+<%- has_delete = ActionController::Routing::Routes.routes.collect{|x| x if x.matches_controller_and_action?(controller_name, "destroy") }.compact.size > 0 %>
+
+
+<%- if defined?(QUI::IndexTable) -%>
+
+  <%- headers << :oneicon if has_edit %>
+  <%- headers << :oneicon if has_delete %>
+  
+  <%- index_table records, :headers => headers, :class_name => class_name do |r| %>
+    <%- class_name.generic_fields.each do |field| -%>
+      <td><%= render :partial => "generic_controller/data", :locals => { :record => r, :field => field } %></td>
+    <%- end -%>
+
+    <%- if has_edit -%>
+      <td><%= link_to_edit r %></td>
+    <%- end -%>
+    
+    <%- if has_delete -%>
+      <td><%= link_to_delete r %></td>
+    <%- end -%>
+    
+    
+  <%- end -%>
+<%- end -%>
+

data/app/views/generic_controller/_multiple_select.erb

@@ -74,7 +74,7 @@
   <%- klass.generic_field_associations[attribute_name][:class_name].all.each do |element| -%>
     <li>
       <%- if kind == :check -%>
-        <%= check_box_tag "#{table_name}[#{attribute_name.to_s.singularize}_ids][]", element.id, (params[table_name] ? params[table_name]["#{attribute_name.to_s.singularize}_ids"].include?(element.id.to_s) : record.send("#{attribute_name.to_s.singularize}_ids").include?(element.id) ), :id => "#{table_name}_#{attribute_name}_#{element.id}" %>
+        <%= check_box_tag "#{table_name}[#{attribute_name.to_s.singularize}_ids][]", element.id, (params[table_name].present? and params[table_name]["#{attribute_name.to_s.singularize}_ids"].present? ? params[table_name]["#{attribute_name.to_s.singularize}_ids"].include?(element.id.to_s) : record.send("#{attribute_name.to_s.singularize}_ids").include?(element.id) ), :id => "#{table_name}_#{attribute_name}_#{element.id}" %>
         
       <%- elsif kind == :radio -%>
         <%= radio_button_tag "#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]", element.id, (params[table_name] ? params[table_name]["#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]"] == element.id.to_s : record.send(klass.generic_field_associations[attribute_name][:foreign_key]) == element.id), :id => "#{table_name}_#{attribute_name}_#{element.id}" %>

data/app/views/generic_controller/index.erb

@@ -1,30 +1,13 @@
 <%- if defined?(QUI::Toolbar) -%>
   <%- toolbar do |t| -%>
-    <%= t.create %>
-  <%- end -%>
-<%- end -%>
-
-<%- if defined?(QUI::IndexTable) -%>
-  <%- klass = @controller.class.to_s.demodulize.gsub("Controller", "").singularize.constantize -%>
-  <%- headers = klass.generic_fields.collect{|x| x.is_a?(Hash) ? ".#{x.keys.first}".to_sym : ".#{x}".to_sym} -%>
-  <%- has_edit = ActionController::Routing::Routes.routes.collect{|x| x if x.matches_controller_and_action?(@controller.class.to_s.gsub("Controller", "").tableize, "edit") }.compact.size > 0 %>
-  <%- has_destroy = ActionController::Routing::Routes.routes.collect{|x| x if x.matches_controller_and_action?(@controller.class.to_s.gsub("Controller", "").tableize, "destroy") }.compact.size > 0 %>
-
-  <%- headers << :oneicon if has_edit %>
-  <%- headers << :oneicon if has_destroy %>
-  
-  <%- index_table instance_variable_get("@#{@controller.class.to_s.demodulize.gsub("Controller", "").tableize}"), :headers => headers, :class_name => klass do |r| %>
-    <%- klass.generic_fields.each do |field| -%>
-      <%- if field.is_a? Hash -%>
-        <%- attribute_name = field.keys.first.to_sym -%>
-      <%- else -%>
-        <%- attribute_name = field.to_sym -%>
+    <%- begin -%>
+      <%= t.create %>
+    <%- rescue -%>
+      <%- capture do -%>
+        <%- logger.debug "Toolbar: Cannot generate Create button: #{$!}" -%>
       <%- end -%>
-
-      <td><%= render :partial => "generic_controller/data", :locals => { :record => r, :field => field } %></td>
     <%- end -%>
-    
-    <td><%= link_to_edit r   if has_edit %></td>
-    <td><%= link_to_delete r if has_destroy %></td>
   <%- end -%>
 <%- end -%>
+
+<%= render :partial => "generic_controller/index_table" %>

data/app/views/generic_controller/show.erb

@@ -10,16 +10,34 @@
 <%- klass = @controller.class.to_s.demodulize.gsub("Controller", "").singularize.constantize -%>
 <%- table_name = "#{@controller.class.to_s.demodulize.gsub("Controller", "").tableize.singularize}" -%>
 <%- record = instance_variable_get("@#{@controller.class.to_s.demodulize.gsub("Controller", "").tableize.singularize}") -%>
-<dl>
-  <%- klass.generic_fields.each do |field| -%>
-    <%- if field.is_a? Hash -%>
-      <%- attribute_name = field.keys.first.to_sym -%>
-    <%- else -%>
-      <%- attribute_name = field.to_sym -%>
-    <%- end -%>
 
-    <dt><%= h klass.human_attribute_name attribute_name %></dt>
+<%- section_prefix = "#{section}." if defined?(section) -%>
+
+<%- description = capture do -%>
+  <dl>
+    <%- klass.generic_fields.each do |field| -%>
+      <%- if field.is_a? Hash -%>
+        <%- attribute_name = field.keys.first.to_sym -%>
+      <%- else -%>
+        <%- attribute_name = field.to_sym -%>
+      <%- end -%>
+
+      <dt><%= h klass.human_attribute_name attribute_name %></dt>
+
+      <dd><%= render :partial => "generic_controller/data", :locals => { :record => record, :field => field } %></dd>
+    <%- end -%>
+  </dl>
+<%- end -%>
 
-    <dd><%= render :partial => "generic_controller/data", :locals => { :record => record, :field => field } %></dd>
+<%- tab_contents = {} -%>
+<%- record.class.generic_field_associations.each do |k,v| -%>
+  <%- if (v[:kind] == :has_many or v[:kind] == :has_and_belongs_to_many) and not v[:through] -%>
+    <%- tab_contents[k] = capture do -%>
+      <%= render :partial => "generic_controller/index_table", :locals => { :records => record.send(k), :class_name => v[:class_name] } %>
+    <%- end -%>
   <%- end -%>
-</dl>
+<%- end -%>
+
+<%= tabs :tabs => [ { :header => { :text => :"#{section_prefix}tabs.common.description" }, :body => { :text => description } } ] + record.class.generic_field_associations.collect{|k,v| { :header => { :text => t(:"#{section_prefix}tabs.#{table_name}.#{k}") + " (#{record.send(k).count})" }, :body => { :text => tab_contents[k] } } if (v[:kind] == :has_many or v[:kind] == :has_and_belongs_to_many) and v[:through] == false and record.send(k).count > 0 }.compact -%>
+                    
+

data/lib/qm-acts-as-generic-controller-model.rb

@@ -13,14 +13,14 @@ module QM
         
         def has_many(association_id, options = {}, &extension)
           @generic_field_associations ||= {}
-          @generic_field_associations[association_id.to_sym] = { :kind => :has_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false }
+          @generic_field_associations[association_id.to_sym] = { :kind => :has_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present? }
           
           super association_id, options, &extension
         end  
 
         def has_and_belongs_to_many(association_id, options = {}, &extension)
           @generic_field_associations ||= {}
-          @generic_field_associations[association_id.to_sym] = { :kind => :has_and_belongs_to_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false }
+          @generic_field_associations[association_id.to_sym] = { :kind => :has_and_belongs_to_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present? }
           
           super association_id, options, &extension
         end  
@@ -36,7 +36,7 @@ module QM
       
       
         def generic_fields
-          @generic_fields
+          @generic_fields || []
         end
 
         def generic_form_fieldsets

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -74,6 +74,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/views/generic_controller/_data.erb
+- app/views/generic_controller/_index_table.erb
 - app/views/generic_controller/_multiple_select.erb
 - app/views/generic_controller/form.erb
 - app/views/generic_controller/index.erb