caboose-cms 0.3.37 → 0.3.38

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmRkZTI2OGFjZWYwOTJiNjU1ODM3ODAwYjc4ZGRhYzQ3NThjMTBlYw==
+    YzQzMjk4MzMxNmNiMmQ4ZmI5NjRlN2Q1Yjk4OThkZGNmZDgwMjhlOQ==
   data.tar.gz: !binary |-
-    YmZmMWJhMzg1Y2Y5OTFmZTUxZjhhYmY3MWViZjhiNjY3ZDliMDQ1NA==
+    NGJiN2M3MzA2ZTBjOTk4NjYxNzg1M2U3NDllZGY3Yzg1ZDU0ZTQ0MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGQ4ZTViNGJjMzQ2MTM1MWY5ZTRiOTlkMTUzZmFjYjA3ZjEyZjI1MzAxZGE1
-    NTk5MTkzYmE3N2YyNGExNTgxMWE2YTVjZTFhOWI1ZGY0MDRhNzFlNDAwMjIz
-    NWJlYjg0MzBlMGRhM2Y4MTA5MWU4MjUxZjM5OWVjZmM3ZmNiNjc=
+    MDc3NzA2OGMyODljMmEyYjhkOWU2OGZmNjk4Y2JmNmJkMzZmMDIxMTQ1NGQ4
+    ZTJjOWJmNGU1NDgyZWFhMjQ0YTdmM2IzYzU4NmQ4OWE5NDAwZTg3Mzc1YmZh
+    MDIyZjkxYjM2ZDMxZDdlNWNmODFhNmFlY2I3OGIwMWFhYTU2MTI=
   data.tar.gz: !binary |-
-    OTVlMzQ2ZGE1OWNiYzNkZjdkNjBmMDk4ODAxOGI0N2IwYWNiNDJhZTQzZDg1
-    ZWEwMjgxYmE5NWZlOTFjMTIzMGU5YjNmOTI5NTE2OTg5MjIyNjVjMDU1OGMz
-    MjAyNWU0NzZkZWEwMjg0ZDcwZDQ5YWVmODdhMzRkNjk0ODVmNDA=
+    MDI2Y2MyZmYxYzRkNjQzMTU5MGRjYjhhN2IzZjZiZTlmYzg4OGMwOWU0ZTMz
+    YmJlMTgxZjkyMDU0ODM1MTM3OGQxZmIwNmRjZDIyYjczNmQ2NjY2ZWI0ZjQ1
+    ZGZlY2EyMWIyYzU1OWIxNTRiZGE4NzRjNzcxODVlZDI2N2RjODg=

data/app/assets/javascripts/caboose/modal_integration.js

@@ -3,7 +3,7 @@ var CabooseModal = function(w, h) {
   if (!h)
   {
     $('#modal_content').css('width', w);
-    h = $('#modal_content').outerHeight(true);
+    h = $('#modal_content').outerHeight(true);    
   }  
   if (parent.$.fn.colorbox)
     this.resize(w, h);
@@ -27,7 +27,7 @@ CabooseModal.prototype = {
   
   colorbox: function() {
     if (parent && parent.$.fn.colorbox)
-    {
+    {            
       parent.$.fn.colorbox.resize({ 
         innerWidth:  '' + this.width + 'px', 
         innerHeight: '' + this.height + 'px' 

data/app/models/caboose/page_bar_generator.rb

@@ -69,10 +69,20 @@ module Caboose
   		return m if @options['includes'].nil?
   		
   		associations = []
-  		@options['includes'].each do |field, arr|
-  		  next if @params[field].nil? || (@params[field].kind_of?(String) && @params[field].length == 0)
+  		@options['includes'].each do |field, arr|  		  
+  		  next if @params[field].nil? || (@params[field].kind_of?(String) && @params[field].length == 0)  		  
         associations << arr[0]
-      end      
+      end
+      if @options['sort']
+        @options['sort'].split(',').each do |col|
+          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
@@ -190,8 +200,9 @@ module Caboose
   	  if !@custom_url_vars.nil?
   	    return @custom_url_vars.call @options['base_url'], @params
   	  end
+  	  
   	  vars = []
-  	  @params.each do |k,v|
+  	  @params.each do |k,v|  	    
   	    next if @options['skip'].include?(k)
   	    k = @options['abbreviations'].include?(k) ? @options['abbreviations'][k] : k  	      	    
   	    if v.kind_of?(Array)

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.37'
+  VERSION = '0.3.38'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.37
+  version: 0.3.38
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails