caboose-cms 0.3.59 → 0.3.60

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzYxMGM3OTFjZTExMzM3ODNlMGRkYWM5NjU0OWUzMjEzNWZiNGI0MQ==
+    ZDNjNzU4MWUxM2VhNDcyOTcwOTcyOTFhMGM1M2JiNGFhOWIxMWY1Mg==
   data.tar.gz: !binary |-
-    ZDE0N2YwOTExZWE3ZTU1NGFiODc5ZmJlMjEwMmYyYzMzODAzMWE5OQ==
+    MWEyYTdkNDFiNDY2MTI0M2VlYzI5MTlhNDYyYzYxMDFhZTRlMmE4Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2ZkMzE2YjA1MWY5MjMwYzQwMTMwNjU2YTRlNTM3NTlkMTZiOTdjZWZjYzUy
-    N2IyZDI5OWY0MTUyZDI3ZTc2N2ZlMGZmY2U5NzU3M2VjMmJmZTJmOTI4Yzgx
-    MTZhMjNlNGQ4MzEyYzEzYjQwZGU0OWVkMTk0NmViYTBjMWRkMGI=
+    ODg1OGU4OWU3NTY1MGU0MjZlYzNkYzQxNDI5YTc0NTg5YzlmODY1Y2IzNzI5
+    MTI2ZmZjMWFkOGI1ZjJiOTk5Mjc5ZjMxYTIxMzgxMTk4YjhlZjMxYjdkOTEw
+    OWVjODBiZjY2Y2Q4YTlkZDRjYWFhODFhYTY4YzQ4ZDU4YjA1NDc=
   data.tar.gz: !binary |-
-    NTY3MzU1NzhkYzY0ODE0YjJkZDE2ODM4NWZhYWRlMDA2ODJlOWI5MTg2NDIx
-    MGI2ZTVkNjQ5MjlkNGFiOTVjNDBmZGZmNzBiOGNkNjhhMjFlOTkyZjc2N2Zj
-    ZDkyYTFjOTA0OTNkYTI4YWIwYTE5N2IzNThkNTlmMTQ4Y2RmOGQ=
+    OGJiODRmOGM5YWQwMzNiNWM3N2EzY2JjZTJjMzk4ZjAyZGM0MTE0NTk0ZWFj
+    YjU3ZDFiYmZhZTk1NWIzZjhiNjk2NzJiNDkxZjA0ZTA2ZDkwNjBkZTk1OGM5
+    ZjBmZGQ4NTkxMTM4ZDEwNjIxNTdiZTI2ZjE5Y2M5YTU1Nzk3ZTU=

data/app/models/caboose/page_bar_generator.rb

@@ -31,6 +31,7 @@ module Caboose
   	  
   		# Note: a few keys are required:
   		# base_url, page, itemCount, itemsPerPage
+  		@orginal_params = {}
   		@params = {}
   		@options = {
   		  'model'           => '',
@@ -48,8 +49,11 @@ module Caboose
   			                         #   search_field_2 => [association_name, join_table, column_name]
   			                         # }  			
   		}      
-  		params.each   { |key, val| @params[key]  = val }
-  		options.each  { |key, val| @options[key] = val }
+  		params.each { |key, val|
+  		  @original_params[key] = val
+  		  @params[key] = val 
+  		}
+  		options.each { |key, val| @options[key] = val }
   		
   		#@params.each  { |key, val|  		  
   		#  k = @options['abbreviations'].include?(key) ? @options['abbreviations'][key] : nil  		  
@@ -313,8 +317,17 @@ module Caboose
           arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_lt')                                  
           arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_bw')                                              
           arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_ew')
-          arr[arr.count-1] = arr[arr.count-1][0..-6] if k.ends_with?('_like')                                            
-          col = "concat(#{arr.join(",' ',")})"
+          arr[arr.count-1] = arr[arr.count-1][0..-6] if k.ends_with?('_like')
+          arr2 = []
+          arr.each do |col|
+            if @options['includes'] && @options['includes'].include?(col)           
+              arr3 = @options['includes'][col]
+              arr2 << "#{table_name_of_association(arr3[0])}.#{arr3[1]}"
+            else
+              arr2 << col
+            end            
+          end
+          col = "concat(#{arr2.join(",' ',")})"
         end
         
         sql2 = ""

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.59'
+  VERSION = '0.3.60'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.59
+  version: 0.3.60
 platform: ruby
 authors:
 - William Barry