caboose-cms 0.2.44 → 0.2.45

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzQyOTQwOTg1NmVkMDY5YTFiNjQ5ZTg3YTZhNmNmZjQwZGYwZWYxZg==
+    Y2MzMzVjYTg4M2Q3NzBhZTZlYTZjYzViYjNiMTJjM2IxYTFmOTU3Mw==
   data.tar.gz: !binary |-
-    MDgwYzg5ZDFjZTMxYzJlZjNhYjU5ODQ2NWYyYzU5Mzc3NTc4NWYyMA==
+    YjhkMmUwNzUwYmIyZGFlZDQ4ZjQ3NzRiNjEzYWE5NGYzMjQ1MzRmMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGU2YWY2YjY3NWJhZTI0NGFkOWUwMWM0YjllOWNiZGQxOWIxZGUwMmU2MThm
-    NTZjOWM3YzI2OGFmMmMwNGY5YTA5MzcwYzg3NjA5MGNmNmE5YmEzODc5Yjkz
-    YjMxZWNiODI4ZDRlOTBhMWQ5ZDA3ZjllNmM5ZTY3ZmVhOTMyYjU=
+    YzJjOTMwOWRiNzkzYzY2MGFmMjNkMjRhMWNiYzkxZTBkNTIwNjYyNzQ5NTI4
+    NmRkNTRmYThmNTRkN2Q3MzQzNDI5YmUxODNhMjBiZGE3NDVlNzExZDQxNDM5
+    NDI1ZjIxYzU1OTYwOGNkYjEzNmYzZGY1OGVmYzQxMWUyMmYwMzM=
   data.tar.gz: !binary |-
-    OGZmYjVkMzY0MTYxYjg4ZmUwZTUwMGY0YjhhMjk4ZTliYTU2MjA4MTEyMDQ5
-    ZmFjYmNlMjMwMjNjMWQ3MTA5YzNjNDU2Mzk1MjUzZGIyNDBmY2MzMWY5Y2I1
-    OTI3MWYyZDY2MDkzNDM0ODdmMDcwMTE2ZTU1Mjk4ZWFmZTA0ZGE=
+    OTc2NGFiMDNlMGQ2YTdkOTc3MGI4N2U5N2M3ZjdhNzFiZWM0MTU3MGJlZWUw
+    ZDczZGFjMGU5OThlZDU5ZmIxODJlMTQxMTJjYjkwYTNlZjk2ZjI4NDlkMjIz
+    YjRkZmVlYWY0MjA3MmNhM2JiNDMzMjEzZGE2M2NiODc1ODdlZTI=

data/app/models/caboose/page_bar_generator.rb

@@ -24,7 +24,7 @@ module Caboose
   		@options = {
   		  'model'           => '',
   			'sort' 			      => '',
-  			'desc' 			      => false,
+  			'desc' 			      => 0,
   			'base_url'		    => '',
   			'page'			      => 1,
   			'item_count'		  => 0,
@@ -33,9 +33,10 @@ module Caboose
   		params.each   { |key, val| @params[key]  = val }
   		options.each  { |key, val| @options[key] = val }
   		@params.each  { |key, val| @params[key]  = post_get[key].nil? ? val : post_get[key] }			
-  		@options.each { |key, val| @options[key] = post_get[key].nil? ? val : post_get[key] } 
+  		@options.each { |key, val| @options[key] = post_get[key].nil? ? val : post_get[key] }
+  		@options['desc'] = @options['desc'].to_i
   		@options['item_count'] = @options['model'].constantize.where(where).count
-  		
+  		  		
   	end
   	
   	def ok(val)
@@ -52,7 +53,7 @@ module Caboose
       return true
   	end
   	
-  	def items
+  	def items  	    	  
     	return @options['model'].constantize.where(where).limit(limit).offset(offset).reorder(reorder).all
   	end
   		
@@ -69,8 +70,6 @@ module Caboose
   		# Variables to make the search form work 
   		vars = get_vars()
   		page = @options["page"].to_i
-  		
-  		Caboose.log(@options)
   				
   		# Max links to show (must be odd) 
   		total_links = 5
@@ -131,10 +130,10 @@ module Caboose
     	str = ''
       
     	# key = sort field, value = text to display
-    	cols.each do |sort, text|
-    		desc  = @options['sort'] == sort ? (@options['desc'] ? 0 : 1) : 0
-    		arrow = @options['sort'] == sort ? (@options['desc'] ? ' ↑' : ' ↓') : ''					
-    		link = @options['base_url'] + "?#{vars}&sort=#{sort}&desc=#{desc}"
+    	cols.each do |sort, text|    	  
+    		desc  = @options['sort'] == sort && @options['desc'] == 1 ? 1 : 0
+    		arrow = @options['sort'] == sort ? (desc == 1 ? ' ↑' : ' ↓') : ''    		
+    		link = @options['base_url'] + "?#{vars}&sort=#{sort}&desc=" + (desc == 1 ? "0" : "1")
     		str += "<th><a href='#{link}'>#{text}#{arrow}</a></th>\n"
     	end
     	return str  	
@@ -169,8 +168,7 @@ module Caboose
   	  end
   	  sql_str = sql.join(' and ')
   	  sql = [sql_str]  	   	  
-  	  values.each { |v| sql << v }
-  	  Caboose.log(sql)
+  	  values.each { |v| sql << v }  	  
   	  return sql
     end
     
@@ -183,10 +181,12 @@ module Caboose
     end
     
     def reorder
+      str = "id" 
       if (!@options['sort'].nil? && @options['sort'].length > 0)
-        return @options['sort']
+        str = "#{@options['sort']}"
       end
-      return "id"
+      str << " desc" if @options['desc'] == 1       
+      return str
     end
   end
 end

data/app/models/caboose/pager.rb

@@ -131,10 +131,10 @@ module Caboose
     	str = ''
       
     	# key = sort field, value = text to display
-    	cols.each do |sort, text|
-    		desc  = @options['sort'] == sort ? (@options['desc'] ? 0 : 1) : 0
-    		arrow = @options['sort'] == sort ? (@options['desc'] ? ' ↑' : ' ↓') : ''					
-    		link = @options['base_url'] + "?#{vars}&sort=#{sort}&desc=#{desc}"
+    	cols.each do |sort, text|    	  
+    	  desc  = @options['desc'] ? @options['desc'].to_i : 0
+    		arrow = @options['sort'] == sort ? (desc ? ' ↑' : ' ↓') : ''					
+    		link = @options['base_url'] + "?#{vars}&sort=#{sort}&desc=" + (desc ? "0" : "1")
     		str += "<th><a href='#{link}'>#{text}#{arrow}</a></th>\n"
     	end
     	return str  	

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.44'
+  VERSION = '0.2.45'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.44
+  version: 0.2.45
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails