qm-acts-as-generic-controller 0.1.8 → 0.1.9

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.8"
+    gemspec.version = "0.1.9"
     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

@@ -9,6 +9,15 @@
 <%- end -%>
 
 <%- form_for form_for_param, :html => { :multipart => true } do |f| -%>
+  <%- if params[:association_attribute] -%>
+    <%= hidden_field_tag :association_attribute_name, params[:association_attribute] %>
+    <%= hidden_field_tag :association_attribute_value, params[:association_attribute].scan(/[^\[\]]+/).inject(params) { |memo, obj| memo[obj] } %>
+
+  <%- elsif params[:association_attribute_name] and params[:association_attribute_value] -%>
+    <%= hidden_field_tag :association_attribute_name, params[:association_attribute_name] %>
+    <%= hidden_field_tag :association_attribute_value, params[:association_attribute_value] %>
+  <%- end -%>
+  
   <%= f.error_messages %>
   <%- unless klass.generic_form_fieldsets -%>
     <fieldset>

data/app/views/generic_controller/show.erb

@@ -44,7 +44,9 @@
   <%- if has_privileges and (v[:kind] == :has_many or v[:kind] == :has_and_belongs_to_many) and (v[:generic_create] or not v[:through]) -%>
     <%- tab_contents[k] = capture do -%>
       <%- if v[:generic_create] and has_privileges_to_generic_create -%>
-        <%= link_to t(:"toolbar.create"), url_for([ "new", section, v[:class_name].table_name.singularize ]) + "?#{v[:class_name].table_name.singularize}[#{table_name}_id]=#{record.id}" %>
+        <%- association_attribute = "#{v[:class_name].table_name.singularize}[#{table_name}_id]" -%>
+        <%= link_to t(:"toolbar.create"), polymorphic_path([ "new", section, v[:class_name].table_name.singularize ], { association_attribute => record.id, :association_attribute => association_attribute }), :class => "create" %>
+
       <%- end -%>
     
       <%= render :partial => "generic_controller/index_table", :locals => { :records => record.send(k), :class_name => v[:class_name] } %>

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

@@ -121,15 +121,42 @@ module QM
             if instance_variable_get(singular_variable).save
               flash[:notice] = :savedAsFlash
               if defined?(section)
-                format.html { redirect_to [ section, instance_variable_get(singular_variable) ] }
-                format.xml  { render :xml => instance_variable_get(singular_variable), :status => :created, :location => [ section, instance_variable_get(singular_variable) ] }
+                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 ], params[:association_attribute_name] => params[:association_attribute_value])
+                    else
+                      redirect_to polymorphic_url([ "new", section, model.table_name.singularize ])
+                    
+                    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.privileged_attributes(model, :read)), :status => :created, :location => [ section, instance_variable_get(singular_variable) ] }
+
+
               else
-                format.html { redirect_to instance_variable_get(singular_variable) }
+                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 ], params[:association_attribute_name] => params[:association_attribute_value])
+                    else
+                      redirect_to polymorphic_url([ "new", model.table_name.singularize ])
+                    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.privileged_attributes(model, :read)), :status => :created, :location => instance_variable_get(singular_variable)
                   else
-                    render :xml => instance_variable_get(singular_variable), :status => :created, :location => instance_variable_get(singular_variable)
+                    render :xml => instance_variable_get(singular_variable).to_xml(:only => current_user.privileged_attributes(model, :read)), :status => :created, :location => instance_variable_get(singular_variable)
                   end
                 }
               end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Marcin Lewandowski