qm-acts-as-generic-controller 0.0.9 → 0.0.10

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.9"
+    gemspec.version = "0.0.10"
     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

@@ -1,13 +1,36 @@
-<%- if field.is_a? Hash -%>
-  <%- attribute_name = field.keys.first.to_sym -%>
+<%- @mutliple_select_count ||= 0 -%>
+
+<%- if defined?(field) and defined?(record) -%>
+  <%- if field.is_a? Hash -%>
+    <%- attribute_name = field.keys.first.to_sym -%>
+  <%- else -%>
+    <%- attribute_name = field.to_sym -%>
+  <%- end -%>
+
+  <%- klass = record.class -%>
+  <%- table_name = klass.to_s.tableize.singularize -%>
+
+  <%- if kind == :check -%>
+    <%- field_name = "#{table_name}[#{attribute_name.to_s.singularize}_ids][]" -%>
+    <%- allow_nil = false -%>
+
+  <%- elsif kind == :radio -%>
+    <%- field_name = "#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]" -%>
+    <%- allow_nil ||= record.column_for_attribute(klass.generic_field_associations[attribute_name][:foreign_key]).null -%>
+  <%- end -%>
+
+  <%- collection = klass.generic_field_associations[attribute_name][:class_name].all -%>
+
+
+<%- elsif defined?(collection) and defined?(attribute_name) -%>
+  <%- allow_nil ||= false -%>
+  <%- field_name = attribute_name -%>
+
 <%- else -%>
-  <%- attribute_name = field.to_sym -%>
+  <%- raise ArgumentError, "You must pass some variables as locals to generic_controller/multiple_select partial. Possibilities are: 'field' and 'record' for automatic associations, or 'collection' and 'attribute_name' just for displaying a set." -%>
 <%- end -%>
 
-<%- klass = record.class -%>
-<%- table_name = klass.to_s.tableize.singularize -%>
-
-<%- content_tag(:div, :class => "multiple_select_select", :id => "multiple_select_select_for_#{attribute_name}") do -%>
+<%- content_tag(:div, :class => "multiple_select", :id => "multiple_select_for_#{attribute_name}") do -%>
   <%- content_tag(:div, :class => "filter") do -%>
     <%= text_field_tag "multiple_select_filter_for_#{attribute_name}", "" %>
     <%- javascript_tag do -%>
@@ -23,7 +46,7 @@
 
       Event.observe(window, 'load', function() {
         $("multiple_select_filter_for_<%= attribute_name %>").value = "";
-        $("multiple_select_select_for_<%= attribute_name %>").select("input").each(function(el) {
+        $("multiple_select_for_<%= attribute_name %>").select("input").each(function(el) {
           if(el.checked)
             $(el).up().addClassName('selected'); 
               else 
@@ -35,7 +58,7 @@
     <%- if kind == :check -%>
       <%- javascript_tag do -%>
         Event.observe(window, 'load', function() {
-          $("multiple_select_select_for_<%= attribute_name %>").select("input").each(function(el) {
+          $("multiple_select_for_<%= attribute_name %>").select("input").each(function(el) {
             el.onchange = function() {
               if(this.checked)
                 $(this).up().addClassName('selected'); 
@@ -49,7 +72,7 @@
     <%- elsif kind == :radio -%>
       <%- javascript_tag do -%>
         Event.observe(window, 'load', function() {
-          $("multiple_select_select_for_<%= attribute_name %>").select("input").each(function(el) {
+          $("multiple_select_for_<%= attribute_name %>").select("input").each(function(el) {
             el.onchange = function() {
               if(this.checked) {
                 $(this).up(1).select("li").each(function(el) { el.removeClassName('selected') });
@@ -64,24 +87,38 @@
   <%- end -%>
   
   <ul>
-  <%- if kind == :radio and record.column_for_attribute(klass.generic_field_associations[attribute_name][:foreign_key]).null -%>
+  <%- if kind == :radio and allow_nil -%>
     <li class="null">
-      <%= radio_button_tag "#{table_name}[#{klass.generic_field_associations[attribute_name][:foreign_key]}]", "", record.send(klass.generic_field_associations[attribute_name][:foreign_key]).nil?, :id => "#{table_name}_#{attribute_name}_null" %>
+      <%= radio_button_tag field_name, "", record.send(klass.generic_field_associations[attribute_name][:foreign_key]).nil?, :id => "#{table_name}_#{attribute_name}_null" %>
       <%= label_tag  "#{table_name}_#{attribute_name}_null", t(:"genericController.multipleSelectNull") %>
     </li>
   <%- end -%>
   
-  <%- klass.generic_field_associations[attribute_name][:class_name].all.each do |element| -%>
+  <%- collection.each do |element| -%>
     <li>
       <%- if kind == :check -%>
-        <%= 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}" %>
+        <%- if defined?(record) -%>
+          <%- selected = (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) ) -%>
+        <%- else -%>
+          <%- selected = params[table_name] && params[table_name].include?(element.id.to_s) -%>
+        <%- end -%>
+          
+        <%= check_box_tag field_name, element.id, selected, :id => "ms#{@mutliple_select_count}_#{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}" %>
+        <%- if defined?(record) -%>
+          <%- selected = (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) -%>
+        <%- else -%>
+          <%- selected = params[table_name] && params[table_name] == element.id.to_s -%>
+        <%- end -%>
+        
+        <%= radio_button_tag field_name, element.id, selected, :id => "ms#{@mutliple_select_count}_#{table_name}_#{attribute_name}_#{element.id}" %>
       <%- end -%>
-      <%= label_tag "#{table_name}_#{attribute_name}_#{element.id}", element.link_default_description %>
+      
+      <%= label_tag "ms#{@mutliple_select_count}_#{table_name}_#{attribute_name}_#{element.id}", element.link_default_description %>
     </li>
   <%- end -%>
   </ul>
 <%- end -%>
 
+<%- @mutliple_select_count += 1 -%>

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

@@ -0,0 +1,11 @@
+module QM
+  module ActsAsGenericController
+    module ViewIncludes
+      def multiple_select(options = {})
+        options.symbolize_keys!
+              
+        render :partial => "generic_controller/multiple_select", :locals => options 
+      end
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 require 'qm-acts-as-generic-controller-controller.rb'
 require 'qm-acts-as-generic-controller-model.rb'
+require 'qm-acts-as-generic-controller-view.rb'
 
 ActiveRecord::Base.send :include, QM::ActsAsGenericController::ModelIncludes
 ActionController::Base.send :include, QM::ActsAsGenericController::ControllerIncludes
+ActionView::Base.send :include, QM::ActsAsGenericController::ViewIncludes

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 +02:00
+date: 2010-08-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,7 @@ files:
 - app/views/generic_controller/show.erb
 - lib/qm-acts-as-generic-controller-controller.rb
 - lib/qm-acts-as-generic-controller-model.rb
+- lib/qm-acts-as-generic-controller-view.rb
 - lib/qm-acts-as-generic-controller.rb
 - README.rdoc
 has_rdoc: true