it-logica-application-backbone 1.3.14 → 1.3.15

data/VERSION

@@ -1 +1 @@
-1.3.14
+1.3.15

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.3.14"
+  s.version = "1.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2013-03-18"
+  s.date = "2013-04-23"
   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

@@ -427,6 +427,9 @@ module ModelMixins
     end
 
     def filter(object, settings, params, per_page = 10, total_count = nil)
+      inactive_columns = get_columns_with_inactive_filter
+
+
       order_by = params[:real_order_by]
 
       cond_str = ""
@@ -447,6 +450,8 @@ module ModelMixins
           # filtering by table filters
           if !params.blank? && params['find']
             params['find'].each_pair do |i, v|
+              next if inactive_columns.include?(i)
+
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
                 if i.match(/^.*?non_existing_column___.*$/i)
@@ -489,6 +494,8 @@ module ModelMixins
 
           if !params.blank? && params['find_exact']
             params['find_exact'].each_pair do |i, v|
+              next if inactive_columns.include?(i)
+
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
                 if i.match(/^.*?non_existing_column___.*$/i)
@@ -515,6 +522,8 @@ module ModelMixins
           # ToDo ladas add having condition to others
           if !params.blank? && params['multichoice']
             params['multichoice'].each_pair do |i, v|
+              next if inactive_columns.include?(i)
+
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
                 if i.match(/^.*?___sql_expression___.*$/i)
@@ -539,6 +548,8 @@ module ModelMixins
             from_hash = params['date_from']
 
             from_hash.each_pair do |i, v|
+              next if inactive_columns.include?(i)
+
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
                 if i.match(/^.*?___sql_expression___.*$/i)
@@ -562,6 +573,8 @@ module ModelMixins
             to_hash = params['date_to']
 
             to_hash.each_pair do |i, v|
+              next if inactive_columns.include?(i)
+
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
                 if i.match(/^.*?___sql_expression___.*$/i)
@@ -586,6 +599,8 @@ module ModelMixins
             from_hash = params['number_from']
 
             from_hash.each_pair do |i, v|
+              next if inactive_columns.include?(i)
+
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
                 if i.match(/^.*?___sql_expression___.*$/i)
@@ -608,6 +623,8 @@ module ModelMixins
             to_hash = params['number_to']
 
             to_hash.each_pair do |i, v|
+              next if inactive_columns.include?(i)
+
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
                 if i.match(/^.*?___sql_expression___.*$/i)
@@ -685,6 +702,15 @@ module ModelMixins
       ret
     end
 
+    def get_columns_with_inactive_filter
+      inactive_cols = []
+      settings[:columns].each do |c|
+        if c[:inactive_filter]
+          inactive_cols << "#{col[:table]}.#{col[:name]}"
+        end
+      end
+      inactive_cols
+    end
 
     def check_non_existing_colum_order_by(settings, params)
       order_by_params = params[:order_by].dup.gsub(/___unknown___\./, "") #some cleaning job

data/lib/table_settings/table_column.rb

@@ -110,6 +110,11 @@ class TableSettings
       self
     end
 
+    # When using the filter box in header but filters in own way, not by table (just passing already filtered AREL to table)
+    def inactive_filter(bool = true)
+      @column_hash[:inactive_filter] = bool
+      self
+    end
   end
 
   class CustomColumn < Column

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &74739140 !ruby/object:Gem::Requirement
+  requirement: &70030660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74739140
+  version_requirements: *70030660
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &74738140 !ruby/object:Gem::Requirement
+  requirement: &70029470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *74738140
+  version_requirements: *70029470
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &74736480 !ruby/object:Gem::Requirement
+  requirement: &70027830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74736480
+  version_requirements: *70027830
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77599400 !ruby/object:Gem::Requirement
+  requirement: &73005340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77599400
+  version_requirements: *73005340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77598400 !ruby/object:Gem::Requirement
+  requirement: &73004400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *77598400
+  version_requirements: *73004400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77597480 !ruby/object:Gem::Requirement
+  requirement: &73003530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *77597480
+  version_requirements: *73003530
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &77596530 !ruby/object:Gem::Requirement
+  requirement: &73002570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77596530
+  version_requirements: *73002570
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -633,7 +633,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 856536783
+      hash: 2123661
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: