it-logica-application-backbone 1.2.11 → 1.2.12

data/VERSION

@@ -1 +1 @@
-1.2.11
+1.2.12

data/app/views/helpers/_build_table.html.erb

@@ -101,7 +101,7 @@
       <%= render :partial => "/helpers/build_table_wrapper", :locals => {:settings => settings} %>
 
       <% if settings[:display_method].blank? %>
-          <div class="<%= settings[:form_id] + '_ajax_pager' %>">
+          <div class="<%= settings[:form_id] + '_ajax_pager' %> parent-filter-paging placement-down">
             <%= render :partial => 'helpers/build_table_pager', :locals => {:settings => settings, :placement => "placement-down"} %>
           </div>
       <% end %>

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.2.11"
+  s.version = "1.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2012-11-07"
+  s.date = "2012-11-08"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [

data/lib/model_mixins/table_builder_class_methods.rb

@@ -461,11 +461,20 @@ module ModelMixins
             params['multichoice'].each_pair do |i, v|
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
-                cond_str += " AND " unless cond_str.blank?
-                cond_id = "multichoice_#{i.gsub(/\./, '_')}"
+                if i.match(/^.*?___sql_expression___.*$/i)
+                  i = i.gsub(/___sql_expression___\./, "") #some cleaning job
+                  having_cond_str += " AND " unless having_cond_str.blank?
+                  cond_id = "multichoice_#{i.gsub(/\./, '_')}"
 
-                cond_str += "#{i} IN (:#{cond_id})" #OR guest_email LIKE :find"
-                cond_hash.merge!({cond_id.to_sym => v})
+                  having_cond_str += "#{i} IN (:#{cond_id})" #OR guest_email LIKE :find"
+                  having_cond_hash.merge!({cond_id.to_sym => v})
+                else
+                  cond_str += " AND " unless cond_str.blank?
+                  cond_id = "multichoice_#{i.gsub(/\./, '_')}"
+
+                  cond_str += "#{i} IN (:#{cond_id})" #OR guest_email LIKE :find"
+                  cond_hash.merge!({cond_id.to_sym => v})
+                end
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &81381370 !ruby/object:Gem::Requirement
+  requirement: &70934320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81381370
+  version_requirements: *70934320
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &81380990 !ruby/object:Gem::Requirement
+  requirement: &70933860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81380990
+  version_requirements: *70933860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81380580 !ruby/object:Gem::Requirement
+  requirement: &70933540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *81380580
+  version_requirements: *70933540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81380060 !ruby/object:Gem::Requirement
+  requirement: &70933160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *81380060
+  version_requirements: *70933160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81379490 !ruby/object:Gem::Requirement
+  requirement: &70932760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *81379490
+  version_requirements: *70932760
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &81378960 !ruby/object:Gem::Requirement
+  requirement: &70932250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81378960
+  version_requirements: *70932250
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -617,7 +617,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -247548655
+      hash: 546363859
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: