caboose-cms 0.2.47 → 0.2.48

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDBiZmVjZmE5NTc4NzhkMzE1ZTE1ZjhhMGY5ZDIxMDc4NmNjNmFkYw==
+    NDUzMTk2MWQ2ZmU5YmFjYzUwODdhMGI3ZjgyNzFmYzhkMDc3ZmUzYg==
   data.tar.gz: !binary |-
-    ZTBkODIyYzJiMTk4MTAyOGYzYTkzYTcyNjlmZDk1NDA4YzRiZWI2Ng==
+    MmVkODUwZjhmYmEwYmJiMzkwMTNkZGNmYmQ5NGIxMjJiMmNlNmZhNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWYxYmUzYWY4OWI0MjMwYTQxNzA5ZjQ3MGNjOWM5ZGE3NTE0MmJjZTQxZjVj
-    YjA0NmRlYTViZTY3MDQ0NGQzNTg5MWM0MjFlNmNhZGE1MmI0NTI1ZjdmODM4
-    OTUxOTRjNTQ0MzY0YTAzMDc0Y2Y0MWNjZDRlNWEwMjUxNWFlNDY=
+    ODlmY2VlZjczODY3YjUwMmZmY2Q0NTkwNjg1OWFmNjczMzY2NjkzN2Q5YjA5
+    MGU5MGZiOTlkNWIxNGNlOTkxNjliY2I5YzA2YjEzNzRiZjUxMDY3ZmEyMzIz
+    N2ExMDVlNzAyMGY1MWU0YTNjZTE1NjZlODg5NWMwNmVkMjZjYTQ=
   data.tar.gz: !binary |-
-    NzAwYTkzZTc0YjQ3NGYyMGE1ODA1MDNkNTQzODRlNzZkMzE5MzllYmJlMjJj
-    OTRhNzViOTE5NDlmZTgxOTgzMGJiMTNjMjYwYzRiN2Q0NTBjNWM5YmM5ZWZh
-    MTdmZDkwYzU5MGEyYzQxNzAxZTA5MjA1NWE2ZTQwODdlMmE4Yzg=
+    YmI1M2FhOTc4NDRhYjkxZTNhZWUwYjBlNzU0NDM1ZjFkYTZjZGE1NGY3Zjk0
+    OTYwNjEwMzQ2NGQ2M2ViZTg3ODg5N2FmNTY5ZDNiYjU2NjY1Y2YyN2VmZjAw
+    MmVlZDYyOGRiNjNjYjcyMjEyZWYyNWRmMDhkYTMxYjIwNjdmOTk=

data/app/models/caboose/page_bar_generator.rb

@@ -34,10 +34,22 @@ module Caboose
   		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['desc'] = 1 if @options['desc'] == 'true'
-  		@options['desc'] = 0 if @options['desc'] == 'false'
-  		@options['item_count'] = @options['model'].constantize.where(where).count
-  		  		
+  		fix_desc  		  		
+  		@options['item_count'] = @options['model'].constantize.where(where).count  		  		
+  	end
+  	
+  	def fix_desc
+  	  return if @options['desc'] == 1
+  	  return if @options['desc'] == 0
+  	  if @options['desc'] == 'true'
+  	    @options['desc'] = 1
+  	    return
+  	  end
+  	  if @options['desc'] == 'false'
+  	    @options['desc'] = 1
+  	    return
+  	  end
+  	  @options['desc'] = @options['desc'].to_i 
   	end
   	
   	def ok(val)
@@ -131,10 +143,9 @@ module Caboose
     	str = ''
       
     	# key = sort field, value = text to display
-    	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")
+    	cols.each do |sort, text|    		
+    		arrow = @options['sort'] == sort ? (@options['desc'] == 1 ? ' ↑' : ' ↓') : ''    		
+    		link = @options['base_url'] + "?#{vars}&sort=#{sort}&desc=" + (@options['desc'] == 1 ? "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.47'
+  VERSION = '0.2.48'
 end

metadata

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