carnival 0.0.43 → 0.0.44

data/app/assets/stylesheets/carnival/main.css

@@ -2326,6 +2326,6 @@ table input{
   width: 95%;
 }
 
-.checkbox{
+.existing-options span{
   float: left;
 }

data/app/datatable/carnival/generic_datatable.rb

@@ -124,7 +124,7 @@ module Carnival
 
       date_filter_field = @presenter.date_filter_field
       if(date_filter_field.present? && params[:from].present? && params[:from] != "" && params[:to].present? && params[:to] != "")
-        @model = @model.where("#{@presenter.table_name}.#{date_filter_field.name} between ? and ?", "#{params[:from]} 00:00:00", "#{params[:to]} 23:59:59")
+        records = records.where("#{@presenter.table_name}.#{date_filter_field.name} between ? and ?", "#{params[:from]} 00:00:00", "#{params[:to]} 23:59:59")
         add_filter 'Período',"#{params[:from]} - #{params[:to]}"
       end
 

data/app/models/carnival/model_helper.rb

@@ -19,5 +19,10 @@ module Carnival::ModelHelper
       end
       select
     end
+
+     def to_label_options
+      label = column_names.select { |column| column.eql?("name")}
+      label.empty? ?  column_names.fetch(1).to_sym : label.first.to_sym
+    end
   end
 end

data/app/views/carnival/shared/form/_form.html.haml

@@ -11,7 +11,7 @@
       nestedForms[getFormName(element)] = element;
       element.remove();
     });
-    
+
     $(".existing-options").hide();
     $(".nested-form-subtitle").hide();
   });
@@ -52,6 +52,6 @@
     $(".existing-options").toggle();
   }
 
-  function renderSelectOptions(){
-    $(".existing-options").show();
+  function renderSelectOptions(selector){
+    $(selector).show();
   }

data/app/views/carnival/shared/form/_inner_form.html.haml

@@ -21,12 +21,13 @@
             
             - if field.nested_form_modes?(:associate)
               = " | "
-              = link_to_function t("nested_form.existing_option"), "renderSelectOptions()"
-        
-          .existing-options
+              = link_to_function t("nested_form.existing_option"), "renderSelectOptions('.existing-options.#{field.name}')"
+
+          .existing-options{:class => field.name}
             %h4.existing-options-title
               = t("nested_form.existing_option_title")
-            = f.association field.name.to_sym, as: :check_boxes,label: false
+            - field_presenter = model_presenter.presenter_to_field(field, nil)
+            = f.collection_check_boxes "#{field.name.singularize.to_sym}_ids".to_sym, field_presenter.model_class.send("all"), :id, field_presenter.model_class.to_label_options
 
           %ul.nested-form-list{:class => field.name}
             %h4.nested-form-subtitle

data/lib/carnival/version.rb

@@ -1,3 +1,3 @@
 module Carnival
-  VERSION = "0.0.43"
+  VERSION = "0.0.44"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnival
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails