caboose-cms 0.4.38 → 0.4.39

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjE4YTAxZTM2NTRlZDg5OTMzYWNjNmJlYjgzZDRmOGNiNjUzYzJkYg==
+    ZjA2M2JlNTM5NzZjNTlmZDAyYWVlODlmZjMyNmY5NDFjMTRkZDZhMA==
   data.tar.gz: !binary |-
-    NmRhMDdiMjM2MzMxMTcxMGVjZGMyMWMwNmFhYzM5MTQyMDg4YjBhMA==
+    OTA2NDJkMWMxNjQyNmQ2N2I5ZjIwYWE5MDg0MjQ2OWZhMDcwNDYzOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2M1ZDYzNjQzNzFkZjY2OWNjNzczYmM0ZThjZjNmZTc3ODhlMDAyOWQzNGNk
-    MzE3NTNkYTc1ODNkMGQwOGNlNmU4YmYxZWYwZTlmMmJhNjEwOTRmZmYzZTZi
-    ZTM5NzUyNWUxNzFmMTBiYjA1MjAxY2MzM2Q4MDhkYjZkNWM1ZTU=
+    ZWFjOGE4ZTA2NTg1YjhjNDc2NDhiMDQxNDJlNDE4Y2UxNTE4ZDJiNzE1ZTE2
+    MzVkYjkyYWNmYTA2Y2Q5MDY0YWE2YTg5MTQwMmM2OWQ1MjM4OTU3YWNhODFh
+    MmUxMjEwNzQ1MzMwYmRmMzQyYzM5ZjQzYjg5ZDYxYjliZWExZWI=
   data.tar.gz: !binary |-
-    NWYxMTkwZjYzMTNkYjMyZTMzNTgxMDdiMjM1MzBhOTFlZGFmMWY3MjBjM2I1
-    YzJlZGU2N2Y5MGQ3MzdiZGU3ZGEwYmY0ZWZhNjNiYzRlOGY0Yjk2YmFmNzU3
-    Mjk2NDViMmIyYzk0MTNlNzQyMzI4ODIyOGM4ZjAwNTJmZmJmMTk=
+    NGNjOTIwY2I1MDc1MDczZTY3MzdmNDFmYTI1NDkwMTM1MDNkY2Q5NDUzODhi
+    NTZkNTYwNDlmMWU4NGI5MmM0YTU0NjZkZTY1MWIzNDgxNDQ2NWNmY2UyMjQ2
+    MmM5N2VhZTYwZTFkMzFhOGJmZTkzMGY2MDVjYzMzNDljZDUwYjQ=

data/app/assets/stylesheets/caboose/modal.css

@@ -107,7 +107,7 @@ div.model_attribute_text {
 input, select, textarea {
   font-family: "Avenir", Arial;
   border: 2px solid #ccc;
-  background: none;
+  background: #000;
   color: #fff;
   /*
   -moz-border-radius: 2px;

data/app/controllers/caboose/pages_controller.rb

@@ -53,13 +53,17 @@ module Caboose
 
       page = Page.page_with_uri(File.dirname(uri), false)
       if (page.nil? || !page)
-        render :file => "caboose/extras/error404", :layout => "caboose/error404" 
+        respond_to do |format|          
+          format.all { render :file => "caboose/extras/error404", :layout => "caboose/error404", :formats => [:html] }
+        end         
         return
       end
         
       asset = Asset.where(:page_id => page.id, :filename => File.basename(uri)).first
       if (asset.nil?)
-        render :file => "caboose/extras/error404", :layout => "caboose/error404"
+        respond_to do |format|          
+          format.all { render :file => "caboose/extras/error404", :layout => "caboose/error404", :formats => [:html] }
+        end
         return
       end
 

data/app/models/caboose/page_bar_generator.rb

@@ -34,16 +34,17 @@ module Caboose
   		@original_params = {}
   		@params = {}
   		@options = {
-  		  'model'           => '',
-  			'sort' 			      => '',
-  			'desc' 			      => 0,
-  			'base_url'		    => '',
-  			'page'			      => 1,
-  			'item_count'		  => 0,
-  			'items_per_page'  => 10,  			
-  			'abbreviations'   => {},
-  			'skip'            => [], # params to skip when printing the page bar  			
-  			'includes'        => nil # Hash of association includes
+  		  'model'            => '',
+  			'sort' 			       => '',
+  			'desc' 			       => 0,
+  			'base_url'		     => '',
+  			'page'			       => 1,
+  			'item_count'		   => 0,
+  			'items_per_page'   => 10,  			
+  			'abbreviations'    => {},
+  			'skip'             => [], # params to skip when printing the page bar
+        'additional_where' => [],
+  			'includes'         => nil # Hash of association includes
   			                         # {
   			                         #   search_field_1 => [association_name, join_table, column_name],
   			                         #   search_field_2 => [association_name, join_table, column_name]
@@ -333,6 +334,7 @@ module Caboose
           arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_bw')                                              
           arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_ew')
           arr[arr.count-1] = arr[arr.count-1][0..-6] if k.ends_with?('_like')
+          arr[arr.count-1] = arr[arr.count-1][0..-6] if k.ends_with?('_null')
           arr2 = []
           arr.each do |col|
             if @options['includes'] && @options['includes'].include?(col)           
@@ -370,6 +372,10 @@ module Caboose
           col = "#{table}.#{k[0..-6]}" if col.nil?
           sql2 = "upper(#{col}) like ?"
           v = v.kind_of?(Array) ? v.collect{ |v2| "%#{v2}%".upcase } : "%#{v}%".upcase
+        elsif k.ends_with?('_null')
+          col = "#{table}.#{k[0..-6]}" if col.nil?
+          sql2 = "#{col} ? null"
+          v = v == true ? 'is' : 'is not'          
         else
           col = "#{table}.#{k}" if col.nil?
           sql2 = "#{col} = ?"
@@ -383,6 +389,7 @@ module Caboose
         end
         sql << sql2                          
   	  end
+  	  @options['additional_where'].each { |x| sql << x }
   	  sql_str = sql.join(' and ')
   	  sql = [sql_str]  	   	  
   	  values.each { |v| sql << v }  	  

data/app/views/layouts/caboose/application.html.erb

@@ -15,6 +15,12 @@
 <% end %>
   <%  
   b = @page.block  
+  if b.nil?
+    bt = Caboose::BlockType.where(:name => 'layout_basic').first
+    Caboose::Block.create(:page_id => @page.id, :block_type_id => bt.id)    
+    b = @page.block
+    b.create_children
+  end
   str = b.render(b, {     
     :view => self,
     :controller_view_content => yield,
@@ -23,8 +29,9 @@
     :editing => defined?(@editing) ? @editing : false,
     :css => '|CABOOSE_CSS|',
     :js => '|CABOOSE_JAVASCRIPT|',
-    :csrf_meta_tags => '|CABOOSE_CSRF|' 
-  })    
+    :csrf_meta_tags => '|CABOOSE_CSRF|',
+    :logged_in_user => @logged_in_user
+  })       
   str.gsub!('|CABOOSE_CSS|'        , yield(:css))
   str.gsub!('|CABOOSE_JAVASCRIPT|' , yield(:js))  
   str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.38'
+  VERSION = '0.4.39'
 end

metadata

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