qm-acts-as-generic-controller 0.1.14 → 0.1.15

data/Rakefile

@@ -9,12 +9,12 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.1.14"
+    gemspec.version = "0.1.15"
     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"
     gemspec.add_dependency "qui-tabs", ">= 0.0.3"
-    gemspec.add_dependency "qui-toolbar", ">= 0.0.4"
+    gemspec.add_dependency "qui-toolbar", ">= 0.0.5"
     gemspec.add_dependency "rfc822"
     gemspec.add_dependency "sort_alphabetical"
     gemspec.add_dependency "calendar_date_select"

data/app/views/generic_controller/_index_table.erb

@@ -47,7 +47,7 @@
     <%- end -%>
 
     <%- class_name.generic_actions(:action => :index).each do |action| -%>
-      <%= content_tag(:td, send(action[:options][:renderer], { :action => :index, :record => r, :action => action }), :class => "action #{action[:name]}") %>
+      <%= content_tag(:td, send(action[:options][:renderer], { :action => :index, :record => r, :action => :index, :generic_action => action }), :class => "action #{action[:name]}") %>
     <%- end -%>
 
     <%- if has_edit -%>

data/app/views/generic_controller/show.erb

@@ -1,17 +1,28 @@
+<%- 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}") -%>
+
+<%- section_prefix = "#{section}." if defined?(section) -%>
+
+
 <%- toolbar do |t| -%>
   <%= t.index %>
+
   <%= t.separator %>
   <%= t.create %>
+
   <%= t.separator %>
   <%= t.edit %>
   <%= t.delete %>
+
+  <%= t.separator %>
+  <%- klass.generic_actions(:action => :show).each do |action| -%>
+    <%= t.custom(:content => send(action[:options][:renderer], { :action => :show, :record => record, :action => :show, :generic_action => action, :toolbar => true })) %>
+  <%- end -%>
+
 <%- end -%>
 
-<%- 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}") -%>
 
-<%- section_prefix = "#{section}." if defined?(section) -%>
 
 <%- description = capture do -%>
   <dl>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 1
-  - 14
-  version: 0.1.14
+  - 15
+  version: 0.1.15
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +01:00
+date: 2010-12-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,12 +74,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 0
-        - 4
-        version: 0.0.4
+        - 5
+        version: 0.0.5
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency