qm-acts-as-generic-controller 0.0.14 → 0.0.15

data/Rakefile

@@ -9,9 +9,9 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.0.14"
+    gemspec.version = "0.0.15"
     gemspec.files = Rake::FileList.new [ "MIT-LICENSE", "Rakefile", "lib/*", "app/views/generic_controller/*" ]
-    gemspec.add_dependency "qui-common-helpers", ">= 0.0.6"
+    gemspec.add_dependency "qui-common-helpers", ">= 0.0.7"
     gemspec.add_dependency "qui-tabs", ">= 0.0.3"
     gemspec.add_dependency "qui-toolbar", ">= 0.0.4"
     gemspec.add_dependency "rfc822"

data/app/views/generic_controller/form.erb

@@ -58,7 +58,7 @@
           <%- case record.column_for_attribute(attribute_name).type -%>
             <%- when :text -%>
               <%= f.text_area attribute_name, :rows => 5, :cols => 60 %>
-            <%- when :date -%>
+            <%- when :date, :datetime -%>
               <%= f.calendar_date_select attribute_name %>
             <%- when :boolean -%>
               <span class="boolean">

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

@@ -82,7 +82,7 @@ module QM
           respond_to do |format|
             if instance_variable_get(singular_variable).save
               flash[:notice] = :savedAsFlash
-              if defined?(:section)
+              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) ] }
               else
@@ -103,7 +103,7 @@ module QM
           respond_to do |format|
             if instance_variable_get(singular_variable).save
               flash[:notice] = :savedAsFlash
-              if defined?(:section)
+              if defined?(section)
                 format.html { redirect_to [ section, instance_variable_get(singular_variable) ] }
                 format.xml  { head :ok }
               else

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

@@ -13,7 +13,7 @@ module QM
         
         def has_many(association_id, options = {}, &extension)
           @generic_field_associations ||= {}
-          @generic_field_associations[association_id.to_sym] = { :kind => :has_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present?, :generic_create => options[:generic_create] || false }
+          @generic_field_associations[association_id.to_sym] = { :kind => :has_many, :class_name => ( options.has_key?(:class_name) ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present?, :generic_create => options[:generic_create] || false }
           
           options.delete :generic_create
           
@@ -22,7 +22,7 @@ module QM
 
         def has_and_belongs_to_many(association_id, options = {}, &extension)
           @generic_field_associations ||= {}
-          @generic_field_associations[association_id.to_sym] = { :kind => :has_and_belongs_to_many, :class_name => ( options[:class_name] ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present?, :generic_create => options[:generic_create] || false }
+          @generic_field_associations[association_id.to_sym] = { :kind => :has_and_belongs_to_many, :class_name => ( options.has_key?(:class_name) ? options[:class_name].constantize : association_id.to_s.classify.constantize ), :readonly => options[:readonly] || false, :through => options[:through].present?, :generic_create => options[:generic_create] || false }
 
           options.delete :generic_create
           
@@ -31,8 +31,11 @@ module QM
 
         def belongs_to(association_id, options = {})
           @generic_field_associations ||= {}
-          klass  = ( options[:class_name].constantize ? options[:class_name].constantize : association_id.to_s.classify.constantize )
-          @generic_field_associations[association_id.to_sym] = { :kind => :belongs_to, :class_name => klass, :foreign_key => options[:foreign_key] || "#{klass.to_s.tableize}_id" }
+          unless options.has_key?(:polymorphic)
+            klass  = ( options.has_key?(:class_name) ? options[:class_name].to_s.constantize : association_id.to_s.classify.constantize )
+
+            @generic_field_associations[association_id.to_sym] = { :kind => :belongs_to, :class_name => klass, :foreign_key => options[:foreign_key] || "#{klass.to_s.tableize}_id" } 
+          end
 
           super association_id, options  
         end      

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

@@ -24,9 +24,14 @@ module QM
           elsif options[:kind] == :radio 
             field_name = "#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]"
             allow_nil ||= options[:record].column_for_attribute(klass.generic_field_associations[attribute_name][:foreign_key]).null 
-          end 
-
-          collection = klass.generic_field_associations[attribute_name][:class_name].all 
+          end
+          
+          if klass.respond_to? :limit_for_user and defined?(current_user)
+            collection = klass.generic_field_associations[attribute_name][:class_name].limit_for_user(current_user)
+          else
+            collection = klass.generic_field_associations[attribute_name][:class_name].all 
+          end
+          
           render :partial => "generic_controller/multiple_select", :locals => { :mode => :activerecord,
                                                                                 :attribute_name => attribute_name, 
                                                                                 :field_name => field_name, 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 0
-        - 6
-        version: 0.0.6
+        - 7
+        version: 0.0.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency