caboose-cms 0.6.27 → 0.6.28

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2EyNjk4NjZkOTcxNDVkOTkwMGE1N2FlZDVmMDA3M2NiMTIyNjM3ZQ==
+    YjFhYTBlYWY1MTMyOGU5ZjhjNzcyMzQ3MDkwNjZiYTQ5ZjA3N2Q5Nw==
   data.tar.gz: !binary |-
-    ZjdmYThiNmI0Y2I3Nzk0ODk2MDI2Yzc4YWFkNGYwYThhZGRjNDdiNg==
+    YzAwNjA3Y2JmODQwNTg3ZWQyNDFmMTQ3MDhlODExM2JmMjFlYzIyNA==
 SHA512:
   metadata.gz: !binary |-
-    NzhkMTAyOTA4MjE2OWU4ZjU2MGI2ZmFlODQ2NzU1NjlmNGRlZDA3Y2U3ZGMz
-    YzIxNGZlODA4NTFiNGFkYmEwMWFiNTg4NzExMzMyY2Y2NzI1ZjJmYWFiMmFk
-    YzFkNTQyOTQzYTQ0YWQ5ZDA5MGRhNGRjYjljMjlmNWY0YmUwZmE=
+    NjkzMTk0MGE5MjQwMjA4MjllMjJjMDJiMGIyNWFiOTk3NWE4NWI5OGY5Y2Ez
+    YTU4ZGQ1NDZjMTI1MWI5NmJiZmY2NzY2YTY4NWQ0YmY0Y2M4ZGIxOTM5Zjgx
+    NTBkZGNjNWFlOTUzM2ZlYWY1OTE2NmZiMDU0ZDc1ZDhiODdiYjE=
   data.tar.gz: !binary |-
-    Y2E5MGI2ZDY5YjBiMThlZWE1ZmU1ZTAwNWNjZjIyMGY5MmQ0Y2RmZTA2ZDJm
-    MDdmMzZlMmEzNWRmMDA2OTc5ZTI3NjJmOThiOTkyNDgyYWQwODgxNGFiZTli
-    OWUyYmRiNzRlZmViYmNjNzMxNTZiMmFkMThlZDZlZmUxMjdhZjk=
+    NDRhMDAyODhlM2JlZTQ0Y2ZiMjRmN2EwZDZmZmFmNjM5MGFlODhkYmViOTUw
+    YWE5NzFlMDEzMTk3NTllYjQ1ZThhYzBmZGQwYzQyYTk0Zjg4YzdjNzkyYTM5
+    NmVjMDQ3MDdmMDkxYmNmZmZjODU0NTJkMjc0OTliYzA0ZGVjYzM=

data/app/controllers/caboose/calendars_controller.rb

@@ -40,7 +40,7 @@ module Caboose
         case name
           when 'name'         then calendar.name         = value
           when 'description'  then calendar.description  = value
-          when 'color'        then calendar.color        = value       
+          when 'color'        then calendar.color        = value
         end
       end
     

data/app/controllers/caboose/categories_controller.rb

@@ -127,16 +127,16 @@ module Caboose
     end
         
     # GET /admin/categories/status-options
-    def admin_status_options      
+    def admin_status_options
       render :json => [
         { :value => 'Active'   , :text => 'Active'    },
         { :value => 'Inactive' , :text => 'Inactive'  },
         { :value => 'Deleted'  , :text => 'Deleted'   }
       ]
     end
-    
+
     # GET /admin/categories/options
-    def admin_options      
+    def admin_options
       @options = []
       cat = Category.where("site_id = ? and parent_id is null", @site.id).first      
       if cat.nil?
@@ -145,25 +145,25 @@ module Caboose
       admin_options_helper(cat, '')
       render :json => @options
     end
-        
+
     def admin_options_helper(cat, prefix)
       @options << { :value => cat.id, :text => "#{prefix}#{cat.name}" }      
       cat.children.each do |c|
         admin_options_helper(c, "#{prefix} - ")
       end      
     end
-    
+
     # GET /admin/categories/:category_id/products/json
-    def admin_category_products                  
+    def admin_category_products
       query = ["select P.id, P.title from store_category_memberships CM
         left join store_products P on P.id = CM.product_id
-        where CM.category_id = ?
+        where CM.category_id = ? AND P.status = 'Active'
         order by CM.sort_order, P.title", params[:id]]             
       rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
       arr = rows.collect{ |row| { :id => row[0], :title => row[1] }}
       render :json => arr
     end
-    
+
   end
 end
 

data/app/controllers/caboose/station_controller.rb

@@ -6,7 +6,7 @@ module Caboose
     # GET /station
     def index
       @user = logged_in_user
-      page_id = params['page_id'].nil? ? 1 : params['page_id']
+      page_id = params['page_id'].nil? ? Page.index_page(@site.id).id : params['page_id']
       @page = Page.find(page_id)
       @tab = params['tab']
       

data/app/models/caboose/product.rb

@@ -197,5 +197,11 @@ module Caboose
       end
     end            
     
+    def Product.update_on_sale            
+      Product.reorder(:id).all.each do |p|
+        p.delay.update_on_sale 
+      end
+    end
+
   end
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.27'
+  VERSION = '0.6.28'
 end

data/lib/tasks/caboose.rake

@@ -2,6 +2,11 @@ require "caboose/version"
 
 namespace :caboose do
 
+  desc "Update the on sale value for all products and variants"
+  task :update_products_on_sale => :environment do    
+    Product.update_on_sale
+  end
+    
   desc "Create media categories for existing products on all sites"
   task :create_product_media_categories => :environment do
     sites = Caboose::Site.where(:use_store => true).all.each do |s|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.27
+  version: 0.6.28
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg