caboose-cms 0.3.49 → 0.3.50

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWZlMWQxZWMwYjBiMWI4NTFjMTA5ZGQ0NDZhYWFlY2JlZTVkMjA2OQ==
+    OTcxNDc2YWZmMzQ0MmUyMzExYjVkOTM1MDA2ZjcyZTI0YmJhNzMyNw==
   data.tar.gz: !binary |-
-    OTVmYmI0Y2ZhZjNjNDZhZGY2ZmRlYmUyMTQyZTYzY2Y1YWE0MTY4NA==
+    MTQ5NzgwOTk3NmU1YjY3ZDg3MWIwZThiNDcxNmI5OTVkYjBhYWZlZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjQ1ZTJhMDcyZWMxZWRjMTk4N2E1M2YzMWNhZjA0MTZmYzZlYTM0Nzg1ZDMz
-    OWI2YTY3OGY4ZjNkYmRkOGQ3N2ZlY2JhODQ2NzFiNzYyYTE4ZDRlMWMzODE5
-    MThlZDg0MTAzMjdiMzVlOWM4MTExZjgyMWE1NzkzZTUyMjQ5YWY=
+    Yzg3MmRkMjc3YTY3OTliNGViYjVkZjU5ZjFjNDFlMDAxYWNlOTM2MDVlNzA2
+    MTE1NjA5ZGViNGU0YTY3OTQ2NmY3YTZiNDEzZWEzZjg3OWRjYTBkNzFhYzQ3
+    NDBiMmVmMzQ0NTNkOGRjYTg3ZWYyYWVkNTQ4ZjFjYWViZDNlYTc=
   data.tar.gz: !binary |-
-    NjRmYTc5MTE1NzZlNTA5NThlNDcyNDQ4NDdmNDIzNjAzZDYwN2ZiZTZlNWRm
-    Njg4YzNmY2E1YzVjYWYzMDQ3OWExYjRlZTgzOWEzNGY4NGI4OGRmZDIzNzNl
-    MmE2YTE2ZGE5MmQ3YjkzM2VkMzQ0NzYzNjA2ZjgyYTg1YjgzYzg=
+    MWE0MTkwOWM4ZDE2OTgxNDFkYzQ3MWY0ZmUwOWY0MGI4OTM4Y2EwMTBiODJm
+    NmM3OWRiM2RkNTRiMTU3OWQ2YTlkOTRmYTEyMzg0YmQ4M2Q4YTYxNzc4YzY4
+    MjdjZTA1YmVkM2YyMGJjZjcxMzQxOGQzMWQ1NWVkYjcyZGY4NTg=

data/app/models/caboose/page_bar_generator.rb

@@ -70,7 +70,7 @@ module Caboose
   		return m if @options['includes'].nil?
   		
   		associations = []
-  		@options['includes'].each do |field, arr|  		  
+  		@options['includes'].each do |field, arr|    		          
   		  next if @params[field].nil? || (@params[field].kind_of?(String) && @params[field].length == 0)  		  
         associations << arr[0]
       end
@@ -83,7 +83,17 @@ module Caboose
             end
           end
         end
-      end            
+      end
+      @params.each do |k,v|
+        k.split('_concat_').each do |col,v2|        
+          tbl_col = col.split('.')
+          if tbl_col && tbl_col.count > 1
+            @options['includes'].each do |field, arr|
+              associations << arr[0] if table_name_of_association(arr[0]) == tbl_col[0]                              
+            end
+          end
+        end
+      end
   		associations.uniq.each { |assoc| m = m.includes(assoc) }
   		return m
   	end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.49'
+  VERSION = '0.3.50'
 end

metadata

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