caboose-cms 0.3.39 → 0.3.40

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI1YTRmYTg3ODM4NTUwYTRjNzBmYzJiYTE1MmQ1M2QyNDU0YWYzZg==
+    NDJhNzJhOWM0OGYxOTA2NWRjNTFmYzMwZDZmMDE3MmE1MWM4ZDc4MA==
   data.tar.gz: !binary |-
-    N2NkNjJiZmJiOTZlNWIwY2NiYWYzZjFiODcyOWVjNmRkZTEzMGQwZQ==
+    NmU3NWRjZmZkNmUyZjc1YjUwOWMwMDkzYjMyNTZjNGQ4YmQ0MWFmZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjA4Mjc5MWMyN2Q2YzE1ZDUyNmY3NTFkMTYwNmVlNGE3MmM3ZGJlNDMyNDY3
-    NDllMWJjYTc1NGQ5ZTM5OTQ0MmVmMDdlMmMyYmNmZDgyYWY5NjZmYTQzMGY4
-    Y2E5OTgzODUwY2FmYmYwZmIyZjI0NzM0YWY0MWQwZTUxZjQ3NmM=
+    MTJjNjA0ODgyNjMzMGRmODczNDZiY2ZkOWExMGJlYWRhMjVlM2MwY2Q1NmRh
+    YTY2YWM4OGFlZDg1ZDMwMWJmYTVlMzRiYjkxNmRmZGUxMTNjZGQwMjNiMjQz
+    M2Q4ZjgwNDYxOWE1NWJmNzE4NDRlNmUzYTQyNzIwMTc4NTVlMmQ=
   data.tar.gz: !binary |-
-    NWQ2ZGYzMWUzMjgwM2YwMGQ0ZDlhYTA3MGFlYmZhYTQ0Y2ViOTFjNTk2OWM3
-    YjEwOWQyZWViNzI3MzkyOGRiZTZlNzA2ZjRhMjkyNmJkOTU1MDY0NWJkMGRi
-    MTQxOWI0OTlmNTFhZWE1YzZiZDBmM2VlOTY1MzMxZmIzMjg0MDQ=
+    MzNiNWY2Nzg2NTliNmNkZWIyZTNiNjZhNmFhNGYxMWEwMGJlMjQ4ZjYzMzk4
+    YzNmMzYwYmYzNWIwZDIwYTkxMmZmMmFmZWYyZTBmNjg0ZTdiNDNlMjVmZjU4
+    MWUzNWQ2MzYyNDNjYzAzZjlhMzYyNzU3MWE3OWU5M2Q0YTg1OTQ=

data/app/controllers/caboose/application_controller.rb

@@ -171,10 +171,10 @@ module Caboose
     #  redirect_to "/error?message=#{message}"
     #end
     
-    def var(key)
-      v = Var.where(:key => key).first
-        return "" if v.nil?    
-      return v.val
+    def var(name)
+      s = Setting.where(:name => name).first
+      return "" if s.nil?    
+      return s.value
     end
       
   end

data/app/models/caboose/page_bar_generator.rb

@@ -222,6 +222,9 @@ module Caboose
   	      end  	        
   	    end  	      	    
   	  end
+  	  vars.push("sort=#{@options['sort']}")
+  		vars.push("desc=#{@options['desc']}")  		
+  		vars.push("page=#{@options['page']}")  			
   	  return "#{@options['base_url']}" if vars.length == 0
   	  if Caboose.use_url_params
   	    vars = URI.escape(vars.join('/'))  	    

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.39'
+  VERSION = '0.3.40'
 end

metadata

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