qm-acts-as-generic-controller 0.1.18 → 0.1.19

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.1.18"
+    gemspec.version = "0.1.19"
     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

@@ -18,6 +18,14 @@
     <%= hidden_field_tag :association_attribute_value, params[:association_attribute_value] %>
   <%- end -%>
   
+  <%- if klass.respond_to? "document?" and klass.document? and params[:scan_original_id] -%>
+    <%= hidden_field_tag :scan_original_id, params[:scan_original_id] %>
+    
+    <%- content_tag :div, :class => "dialog notice" do  -%>
+      <%= image_tag("actions/document_scan.png", :alt => "") %> Załączono skan dokumentu
+    <%- end -%>
+  <%- end -%>
+  
   <%= f.error_messages %>
   <%- unless klass.generic_form_fieldsets -%>
     <fieldset>

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

@@ -92,72 +92,86 @@ module QM
         end
 
         def create
-          remove_unprivileged_keys_from_params
+          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
 
-          instance_variable_set(singular_variable, model.new(params[singular_variable(true)])) unless instance_variable_defined?(singular_variable)
-          
-          save_creator
-          save_updator
+            remove_unprivileged_keys_from_params
 
-          respond_to do |format|
-            if instance_variable_get(singular_variable).save
-              flash[:notice] = :savedAsFlash
-              if defined?(section)
-                format.html { 
-                  if params[:commit_and_create] 
-                    if params[:association_attribute_name] and params[:association_attribute_value]
-                      redirect_to polymorphic_url([ "new", section, model.table_name.singularize ], :association_attribute => params[:association_attribute_name], params[:association_attribute_name] => params[:association_attribute_value])
+            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
+            
+
+            respond_to do |format|
+              if instance_variable_get(singular_variable).save
+                flash[:notice] = :savedAsFlash
+                if defined?(section)
+                  format.html { 
+                    if params[:commit_and_create] 
+                      if params[:association_attribute_name] and params[:association_attribute_value]
+                        redirect_to polymorphic_url([ "new", section, model.table_name.singularize ], :association_attribute => params[:association_attribute_name], params[:association_attribute_name] => params[:association_attribute_value])
+                      else
+                        redirect_to polymorphic_url([ "new", section, model.table_name.singularize ])
+                      
+                      end
                     else
-                      redirect_to polymorphic_url([ "new", section, model.table_name.singularize ])
-                    
+                      redirect_to [ section, instance_variable_get(singular_variable) ] 
                     end
-                  else
-                    redirect_to [ section, instance_variable_get(singular_variable) ] 
-                  end
-                }
-                
-                format.xml  { render :xml => instance_variable_get(singular_variable).to_xml(:only => current_user_xml_privileged_attributes), :status => :created, :location => [ section, instance_variable_get(singular_variable) ] }
+                  }
+                  
+                  format.xml  { render :xml => instance_variable_get(singular_variable).to_xml(:only => current_user_xml_privileged_attributes), :status => :created, :location => [ section, instance_variable_get(singular_variable) ] }
 
 
-              else
-                format.html { 
-                  if params[:commit_and_create] 
-                    if params[:association_attribute_name] and params[:association_attribute_value]
-                      redirect_to polymorphic_url([ "new", model.table_name.singularize ], :association_attribute => params[:association_attribute_name], params[:association_attribute_name] => params[:association_attribute_value])
+                else
+                  format.html { 
+                    if params[:commit_and_create] 
+                      if params[:association_attribute_name] and params[:association_attribute_value]
+                        redirect_to polymorphic_url([ "new", model.table_name.singularize ], :association_attribute => params[:association_attribute_name], params[:association_attribute_name] => params[:association_attribute_value])
+                      else
+                        redirect_to polymorphic_url([ "new", model.table_name.singularize ])
+                      end
+                      
                     else
-                      redirect_to polymorphic_url([ "new", model.table_name.singularize ])
+                      redirect_to instance_variable_get(singular_variable) 
                     end
-                    
-                  else
-                    redirect_to instance_variable_get(singular_variable) 
-                  end
 
-                }
-                
+                  }
+                  
+                  format.xml { 
+                    if defined?(current_user) and current_user.respond_to? :privileged_attributes
+                      render :xml => instance_variable_get(singular_variable).to_xml(:only => current_user_xml_privileged_attributes), :status => :created, :location => instance_variable_get(singular_variable)
+                    else
+                      render :xml => instance_variable_get(singular_variable).to_xml(:only => current_user_xml_privileged_attributes), :status => :created, :location => instance_variable_get(singular_variable)
+                    end
+                  }
+                end
+              else
+                format.html { 
+                  begin
+                    render :action => "new"
+                  
+                  rescue ActionView::MissingTemplate
+                    render :template => "generic_controller/form" 
+                  end
+                } 
                 format.xml { 
                   if defined?(current_user) and current_user.respond_to? :privileged_attributes
-                    render :xml => instance_variable_get(singular_variable).to_xml(:only => current_user_xml_privileged_attributes), :status => :created, :location => instance_variable_get(singular_variable)
+                    render :xml => instance_variable_get(singular_variable).to_xml(:only => current_user_xml_privileged_attributes), :status => :unprocessable_entity
                   else
-                    render :xml => instance_variable_get(singular_variable).to_xml(:only => current_user_xml_privileged_attributes), :status => :created, :location => instance_variable_get(singular_variable)
+                    render :xml => instance_variable_get(singular_variable), :status => :unprocessable_entity
                   end
                 }
               end
-            else
-              format.html { 
-                begin
-                  render :action => "new"
-                
-                rescue ActionView::MissingTemplate
-                  render :template => "generic_controller/form" 
-                end
-              } 
-              format.xml { 
-                if defined?(current_user) and current_user.respond_to? :privileged_attributes
-                  render :xml => instance_variable_get(singular_variable).to_xml(:only => current_user_xml_privileged_attributes), :status => :unprocessable_entity
-                else
-                  render :xml => instance_variable_get(singular_variable), :status => :unprocessable_entity
-                end
-              }
             end
           end
         end

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

@@ -12,7 +12,15 @@ module QM
           raise ArgumentError, "You must pass options[:user] to limit_with_security_scheme" unless options.has_key? :user
 
           # Return empty set if user has no privileges at all (nor index_any and index_created)
-          return [] if !options[:user].has_privileges?(:class_name => self, :generic_action => :index_any) && !options[:user].has_privileges?(:class_name => self, :generic_action => :index_created)
+          unless options[:user].has_privileges?(:class_name => self, :generic_action => :index_any) or options[:user].has_privileges?(:class_name => self, :generic_action => :index_created)
+#            puts ":("
+#            puts options[:user].inspect
+#            puts self
+#            puts options[:user].has_privileges?(:class_name => self, :generic_action => :index_any)
+#            puts options[:user].has_privileges?(:class_name => self, :generic_action => :index_created)
+#            puts options[:user].has_privileges?(:class_name => self, :generic_action => :index_any) or options[:user].has_privileges?(:class_name => self, :generic_action => :index_created)
+            return []
+          end
           
           creator_column = "creator_#{options[:user].class.to_s.tableize.singularize}_id"
           should_limit_index_for_created = columns_hash.has_key?(creator_column) && options[:user].respond_to?(:has_privileges?) && !options[:user].has_privileges?(:class_name => self, :generic_action => :index_any) && options[:user].has_privileges?(:class_name => self, :generic_action => :index_created)
@@ -85,6 +93,8 @@ module QM
           @named_scopes[name.to_sym] = options.dup
           
           options.delete(:generic) if options.is_a? Hash
+   
+          options[:block] = block if block
           
           super name, options, &block
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 1
-  - 18
-  version: 0.1.18
+  - 19
+  version: 0.1.19
 platform: ruby
 authors: 
 - Marcin Lewandowski