caboose-cms 0.3.43 → 0.3.44

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTQ2YzZjNzlhNjJkMWU2NjllMmI1MGQ2M2M1ZDE1M2E0OGZkNDQxOQ==
+    ZjYzNjkxNzc5MmFjMzY5YTA3ZTVmZGQzN2YzYWNjZTdjMzM2NDU4OQ==
   data.tar.gz: !binary |-
-    ZjYwZjFiYmRkNWY2OWY2ZDAwNjkyYjAxNGE0Y2FhZTFkNmZlNzk0Nw==
+    NzdiM2E1M2EyMTU0YzExNGMxMDIxNDA1NTI1N2JmZDgxNmZlY2IzOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2IwMDAzMTMzOGVlNWZkZGIyZGM1OGUyZTI4MTJmZjk5MGIwYzBhYWM1NjIy
-    YjE5Mjc4MjEyMzViY2VmYTRmODIwNDBkYjQwODZjMmQwMTk1NTExMDJiYTNj
-    OTJkZDdiM2RmOWNiY2ZlZjY2NWI2M2Q5OTZlNWIwODE1NDdhZTc=
+    NWEyMzk4MDk4OGRjYzJiNGFhNDRlYjgxNzBjYzNhODJlNTAyODhkNTE5YmUx
+    Zjc2ZWEwMGE2NjE2MTE5ZmI4NDY2Y2RmMTEwNDRhNTNhZjQ2OTY1YzVlYTQ2
+    NzAwZDRiYTVhYzc3NDdhYWU0ZGM3ZjdkYmU3MGFjODQ0ODE3MGU=
   data.tar.gz: !binary |-
-    ZjY3N2JiNWU2NjE3NjcwZTIxYmRjZDUxMWVlZjllN2VlMzk1MWUzMmVkYzgx
-    OWM1NjgwY2MyNjIyNWRmYjEzOGIyZjkwNDNiZTBmZGY4MzA3MTFmOWM3YWU5
-    OTNjYTAxZDRhNGNkODRlOTI2ZjRiNjZkNDM4YTA1YjNmNWY3NWU=
+    NjI3OTY0Yzg1YzZkN2M5NGMzODUzMDZiZTVlOWUyYTg3NTIzZWIyMDBhMzk5
+    MzQ1MDhjMjdkNGFlY2UzYWI4ZjkyYjljMDFkZDRiZmQxMTA0ZmZmMzhjMTM2
+    NTY3ODhlZmM4Nzc5NjEwOTBkMDllMmE0ZjkzMGYzNTE0M2EwZWU=

data/app/controllers/caboose/users_controller.rb

@@ -62,10 +62,11 @@ module Caboose
     		  'username'	  => '',
     		  'email' 		  => '',
     		},{
-    		  'model'       => 'Caboose::User',
-    	    'sort'			  => 'last_name, first_name',
-    		  'desc'			  => false,
-    		  'base_url'		=> '/admin/users'
+    		  'model'          => 'Caboose::User',
+    	    'sort'			     => 'last_name, first_name',
+    		  'desc'			     => false,
+    		  'base_url'		   => '/admin/users',
+    		  'use_url_params' => false
     	})
     	@users = @gen.items
     end

data/app/models/caboose/page_bar_generator.rb

@@ -21,7 +21,7 @@ module Caboose
     #		itemsPerPage:	Number of items you want to show per page. Defaults to 10 if not present.
     #		page: Current page number.  Defaults to 0 if not present.
     #
-    attr_accessor :params, :options, :custom_url_vars
+    attr_accessor :params, :options, :custom_url_vars    
   	
     #def initialize(post_get, params = nil, options = nil, &custom_url_vars = nil)
   	def initialize(post_get, params = nil, options = nil)
@@ -56,8 +56,9 @@ module Caboose
   		}			
   		@options.each { |key, val| @options[key] = post_get[key].nil? ? val : post_get[key] }
   		#@custom_url_vars = custom_url_vars if !custom_url_vars.nil?
+  		@use_url_params = @options['use_url_params'].nil? ? Caboose.use_url_params : @options['use_url_params']
   		fix_desc
-  		set_item_count  		  		  		
+  		set_item_count
   	end
   	
   	def set_item_count
@@ -168,9 +169,9 @@ module Caboose
   		end
   		
   		base_url = url_with_vars      
-      base_url << (Caboose.use_url_params ? "/" : (base_url.include?("?") ? "&" : "?"))      
-      keyval_delim = Caboose.use_url_params ? "/" : "="
-  		var_delim    = Caboose.use_url_params ? "/" : "&"            
+      base_url << (@use_url_params ? "/" : (base_url.include?("?") ? "&" : "?"))      
+      keyval_delim = @use_url_params ? "/" : "="
+  		var_delim    = @use_url_params ? "/" : "&"            
   		
   		str = ''
   		str << "<p>Results: showing page #{page} of #{total_pages}</p>\n"
@@ -207,7 +208,7 @@ module Caboose
   	    k = @options['abbreviations'].include?(k) ? @options['abbreviations'][k] : k  	      	    
   	    if v.kind_of?(Array)
   	      v.each do |v2|  	        
-  	        if Caboose.use_url_params
+  	        if @use_url_params
   	          vars.push("#{k}/#{v2}") if !v2.nil?
   	        else
   	          vars.push("#{k}[]=#{v2}") if !v2.nil?
@@ -215,7 +216,7 @@ module Caboose
   	      end
   	    else  	      
   	      next if v.nil? || (v.kind_of?(String) && v.length == 0)
-  	      if Caboose.use_url_params
+  	      if @use_url_params
   	        vars.push("#{k}/#{v}")
   	      else
   	        vars.push("#{k}=#{v}")
@@ -226,7 +227,7 @@ module Caboose
   		vars.push("desc=#{@options['desc']}")  		
   		vars.push("page=#{@options['page']}")  			
   	  return "#{@options['base_url']}" if vars.length == 0
-  	  if Caboose.use_url_params
+  	  if @use_url_params
   	    vars = URI.escape(vars.join('/'))  	    
   	    return "#{@options['base_url']}/#{vars}"
   	  end

data/config/routes.rb

@@ -20,9 +20,9 @@ Caboose::Engine.routes.draw do
   get     "my-account"                      => "users#my_account"
   put     "my-account"                      => "users#update_my_account"
   
-  get     "admin/users"                     => "users#index"
+  get     "admin/users"                     => "users#index"  
   get     "admin/users/options"             => "users#options"
-  get     "admin/users/new"                 => "users#new"
+  get     "admin/users/new"                 => "users#new"  
   get     "admin/users/:id/su"              => "users#admin_su"
   get     "admin/users/:id/edit-password"   => "users#edit_password"
   get     "admin/users/:id/edit"            => "users#edit"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.43'
+  VERSION = '0.3.44'
 end

metadata

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