qm-acts-as-generic-controller 0.1.10 → 0.1.11

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.10"
+    gemspec.version = "0.1.11"
     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/_index_table.erb

@@ -1,7 +1,9 @@
 <%- 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(:action => :index).collect{ |x| x[:options][:index_header] || ".#{x[:name]}".to_sym if not current_user.respond_to? "has_privileges?" or (class_name.generic_field_associations.has_key?(x[:name]) and current_user.has_privileges?(:class_name => class_name.generic_field_associations[x[:name]][:class_name])) or (current_user.has_privileges?(:class_name => class_name, :attribute => x[:name], :mode => :read)) }.compact -%>
+<%- privileged_fields = class_name.generic_fields(:action => :index).collect{|field| field if not current_user.respond_to? "has_privileges?" or (class_name.generic_field_associations.has_key?(field[:name]) and current_user.has_privileges?(:class_name => class_name.generic_field_associations[field[:name]][:class_name])) or (current_user.has_privileges?(:class_name => class_name, :attribute => field[:name], :mode => :read)) } -%>
+
+<%- headers = privileged_fields.collect{ |x| x[:options][:index_header] || ".#{x[:name]}".to_sym } -%>
 
 <%- controller_name = "#{defined?(section) ? "#{section.to_s.camelize}::" : ""}#{class_name.to_s.pluralize}".tableize %>
 
@@ -23,17 +25,16 @@
   <%- 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(:action => :index).each do |field| -%>
-      <%- if not current_user.respond_to? "has_privileges?" or (class_name.generic_field_associations.has_key?(field[:name]) and current_user.has_privileges?(:class_name => class_name.generic_field_associations[field[:name]][:class_name])) or (current_user.has_privileges?(:class_name => class_name, :attribute => field[:name], :mode => :read)) -%>
-        <td>
-          <%- if field[:options].has_key? :renderer -%>
-            <%= send(field[:options][:renderer], { :record => r, :field => field, :action => :index }) %>
-          <%- else -%>
-            <%= generic_renderer(:index, { :record => r, :field => field }) %>
-          <%- end -%>
-        </td>
-      <%- end -%>
+    <%- privileged_fields.each do |field| -%>
+      <td>
+        <%- if field[:options].has_key? :renderer -%>
+          <%= send(field[:options][:renderer], { :record => r, :field => field, :action => :index }) %>
+        <%- else -%>
+          <%= generic_renderer(:index, { :record => r, :field => field }) %>
+        <%- end -%>
+      </td>
     <%- end -%>
 
     <%- if defined?(QM::ActsAsWorkflow) and class_name.is_workflow? -%>

data/app/views/generic_controller/show.erb

@@ -15,17 +15,19 @@
 
 <%- description = capture do -%>
   <dl>
-    <%- klass.generic_fields(:action => :show).each do |field| -%>
-      <%- if not current_user.respond_to? "has_privileges?" or (current_user.respond_to? "has_privileges?" and current_user.has_privileges?(:class_name => klass, :attribute => field[:name])) -%>
+    <%- klass.generic_fields(:action => :show).collect{|field| field if not current_user.respond_to? "has_privileges?" or (current_user.respond_to? "has_privileges?" and current_user.has_privileges?(:class_name => klass, :attribute => field[:name])) }.compact.each do |field| -%>
+      <%- data = capture do -%>
+        <%- if field[:options].has_key? :renderer -%>
+          <%= send(field[:options][:renderer], { :record => record, :field => field, :action => :show }) %>
+        <%- else -%>
+          <%= generic_renderer(:show, { :record => record, :field => field }) %>
+        <%- end -%>      
+      <%- end -%>
+      
+      <%- unless data.strip.empty? -%>
         <dt><%= h klass.human_attribute_name field[:name] %></dt>
 
-        <dd>
-          <%- if field[:options].has_key? :renderer -%>
-            <%= send(field[:options][:renderer], { :record => record, :field => field, :action => :show }) %>
-          <%- else -%>
-            <%= generic_renderer(:show, { :record => record, :field => field }) %>
-          <%- end -%>      
-        </dd>
+        <dd><%= data %></dd>
       <%- end -%>
     <%- end -%>
   </dl>

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

@@ -116,6 +116,9 @@ module QM
           remove_unprivileged_keys_from_params
 
           instance_variable_set(singular_variable, model.new(params[singular_variable(true)])) unless instance_variable_defined?(singular_variable)
+          
+          save_creator
+          save_updator
 
           respond_to do |format|
             if instance_variable_get(singular_variable).save
@@ -186,6 +189,7 @@ module QM
           remove_unprivileged_keys_from_params
 
           instance_variable_get(singular_variable).update_attributes params[singular_variable(true)]
+          save_updator
 
           respond_to do |format|
             if instance_variable_get(singular_variable).save
@@ -230,6 +234,14 @@ module QM
         end
         
         protected
+          def save_creator
+            instance_variable_get(singular_variable).send("creator_#{current_user.class.to_s.tableize.singularize}_id=", current_user.id) if defined?(current_user) and instance_variable_get(singular_variable).respond_to? "creator_#{current_user.class.to_s.tableize.singularize}_id="
+          end
+
+          def save_updator
+            instance_variable_get(singular_variable).send("updator_#{current_user.class.to_s.tableize.singularize}_id=", current_user.id) if defined?(current_user) and instance_variable_get(singular_variable).respond_to? "updator_#{current_user.class.to_s.tableize.singularize}_id="
+          end
+          
           def model
             self.class.to_s.demodulize.gsub("Controller", "").singularize.constantize          
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +01:00
+date: 2010-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency