qm-acts-as-generic-controller 0.0.8 → 0.0.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.0.8"
+    gemspec.version = "0.0.9"
     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 "rfc822"

data/app/views/generic_controller/_multiple_select.erb

@@ -74,7 +74,7 @@
   <%- klass.generic_field_associations[attribute_name][:class_name].all.each do |element| -%>
     <li>
       <%- if kind == :check -%>
-        <%= check_box_tag "#{table_name}[#{attribute_name.to_s.singularize}_ids][]", element.id, (params[table_name].present? and params[table_name]["#{attribute_name.to_s.singularize}_ids"].present? ? params[table_name]["#{attribute_name.to_s.singularize}_ids"].include?(element.id.to_s) : record.send("#{attribute_name.to_s.singularize}_ids").include?(element.id) ), :id => "#{table_name}_#{attribute_name}_#{element.id}" %>
+        <%= check_box_tag "#{table_name}[#{attribute_name.to_s.singularize}_ids][]", element.id, (params[table_name] && params[table_name]["#{attribute_name.to_s.singularize}_ids"] ? params[table_name]["#{attribute_name.to_s.singularize}_ids"].include?(element.id.to_s) : record.send("#{attribute_name.to_s.singularize}_ids").include?(element.id) ), :id => "#{table_name}_#{attribute_name}_#{element.id}" %>
         
       <%- elsif kind == :radio -%>
         <%= radio_button_tag "#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]", element.id, (params[table_name] ? params[table_name]["#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]"] == element.id.to_s : record.send(klass.generic_field_associations[attribute_name][:foreign_key]) == element.id), :id => "#{table_name}_#{attribute_name}_#{element.id}" %>

data/app/views/generic_controller/form.erb

@@ -21,8 +21,25 @@
     <%- else -%>
       <%- attribute_name = field.to_sym -%>
     <%- end -%>
+    
 
-    <%- if not klass.generic_field_associations[attribute_name] or (klass.generic_field_associations[attribute_name] and not klass.generic_field_associations[attribute_name][:readonly]) -%>
+    <%- is_association = klass.generic_field_associations[attribute_name].present? -%>
+    <%- association = klass.generic_field_associations[attribute_name] if is_association -%>
+    <%- is_writable = (not is_association or (is_association and not association[:readonly])) -%>
+    <%- if is_writable -%>
+      <%- if is_association -%>
+        <%- if klass.generic_field_associations[attribute_name][:kind] == :has_many or klass.generic_field_associations[attribute_name][:kind] == :has_and_belongs_to_many -%>
+          <%- is_accessible = klass.attr_accessible.include?("#{attribute_name.to_s.singularize}_ids") -%>
+        <%- elsif klass.generic_field_associations[attribute_name][:kind] == :belongs_to -%>
+          <%- is_accessible = klass.attr_accessible.include?(association[:foreign_key].to_s) -%>
+        <%- end -%>
+      <%- else -%>
+        <%- is_accessible = klass.attr_accessible.include?(attribute_name.to_s) -%>
+      <%- end -%>
+    <%- end -%>
+
+    
+    <%- if is_accessible -%>
       <li>
         <%= f.label attribute_name %>
         

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
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Marcin Lewandowski