qm-acts-as-generic-controller 0.2.1 → 0.2.2

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.2.1"
+    gemspec.version = "0.2.2"
     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.9"

data/app/views/generic_controller/form.erb

@@ -49,7 +49,7 @@
     <%- end -%>
 
     
-    <%- if is_accessible and (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]))) -%>
+    <%- if is_accessible and (not current_user.respond_to? "has_privileges?" or field[:options][:skip_privileges_check] == true or (current_user.respond_to? "has_privileges?" and current_user.has_privileges?(:class_name => klass, :attribute => field[:name]))) -%>
       <li>
         <%= f.label field[:name] %>
         

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

@@ -93,20 +93,9 @@ module QM
 
         def create
           model.transaction do
-            if model.respond_to? "document?" and model.document? and params[:scan_original_id]
-              document = Document.find(params[:scan_original_id])
-              logger.info document.inspect
-            end
-
             remove_unprivileged_keys_from_params
 
             instance_variable_set(singular_variable, model.new(params[singular_variable(true)])) unless instance_variable_defined?(singular_variable)
-
-            if document
-              document.send("#{model.to_s.tableize.singularize}=", instance_variable_get(singular_variable)) 
-              logger.info document.inspect
-              document.save
-            end
             
             save_creator
             save_updator
@@ -322,6 +311,19 @@ module QM
           end
 
           def remove_unprivileged_keys_from_params
+=begin
+            if model.respond_to? "document?" and model.document? and params[:document_scan]
+              document = Document.find(params[:scan_original_id])
+              logger.info document.inspect
+            end
+
+            if document
+              document.send("#{model.to_s.tableize.singularize}=", instance_variable_get(singular_variable)) 
+              logger.info document.inspect
+              document.save
+            end
+=end            
+
             if defined?(current_user) and current_user.respond_to? :privileged_attributes
               params[singular_variable(true)].keys.each do |key|
                 if not current_user.privileged_attributes(model, :write).include?(key) and (model.generic_field_associations.has_key?(key.to_sym) and not current_user.privileged_attributes(model, :write).include?(model.generic_field_associations[key.to_sym][:foreign_key]))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +01:00
+date: 2011-04-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency