caboose-cms 0.5.142 → 0.5.143

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzExN2FjYzAwODdmYjQ2ZDM5NmM4ODg1YjllYjM5ZDRjYzRhMmM3NQ==
+    YjhkYWRkNDJiYjlhYTgxNzU1NWQwZTU1ZDNmNzM0NWJkOGM3NzVlYQ==
   data.tar.gz: !binary |-
-    ZDc3NDc3YzEyM2VjY2UxNjk0NjdhZTRjNjIyZWI3ZDVlZDlmNWFiZA==
+    YTNmZWM1YjEzNmU2ZGNhMmYwMTI0MGQzZmYxZjAyOTdhYTc0ZGEwYw==
 SHA512:
   metadata.gz: !binary |-
-    MGRlYWNiZGY0NjVjZjMzZGMxNjIxNWY5MjJkMjBmNTM3NzE2NzFmYTU4NTU5
-    YWQ5ZWQ2NjcwMjA4OGVhZWI3YjYzYzgxMmRkM2YyNjJkMTBkN2FiZDczZGNj
-    NzFmMDQ1ZTAxYjdmNWQxZTMzNzk4YTJlMzVmZjIyZmI5Mjk1ZWI=
+    NTExNjdkZTA0YmIwNTc0ZDk2NjU3NGU2NmU1M2RkOGMwYjE1NTBhYjM4NjVi
+    NzZiNTNkYmUxZDdiNzVkMzc0MTI1M2ZkMTlmYTRmZWM4Y2ZjZDZkNDk0N2Vk
+    YzY3NDVhZjUyYjI1ZGE0MzFhMWZkYjQ5ZmMyOWM1ZTVjYTY4NDY=
   data.tar.gz: !binary |-
-    ZjQ3YmI0MmVkZmFjMGRjYTlkMGM0ZjI3MzgyYjcxMjg2ZjMyZTE2MzBmN2Zk
-    YWJjMzBmNzk2OWExMGVhZTRiMDE4NzEyY2IwYjM2N2ViMDQ2OGVjY2I3MDdh
-    YTYwZTQ4MjYyMWMxMTZiZWM2YTE1Nzg2NzA4NmFhMGZhYmRkNTk=
+    NjUxODYzNzk2MTc5MjZhMjg1OTRkNTM0NThkMjY5YjJiZDEzNWJlMTBjZDhj
+    Zjk4ODY2MzNkOTFjNTg0YTRkNDdjZjEwZjUyZTNkMmUyZDUxMjgyMTE5NDkx
+    ZDBmYzQwNjg2OTRmNWRhNTc2ZDdjMzFmNWI1YjM4MmM2NmY3ZGM=

data/app/controllers/caboose/line_items_controller.rb

@@ -119,8 +119,8 @@ module Caboose
     def admin_product_stubs      
       title = params[:title].strip.downcase.split(' ')
       render :json => [] and return if title.length == 0      
-      where = []
-      query = [""]
+      where = ["site_id = ?"]
+      query = [@site.id]
       title.each do |str|
         where << 'lower(title) like ?'
         query << "%#{str}%"

data/app/controllers/caboose/orders_controller.rb

@@ -43,6 +43,7 @@ module Caboose
     def admin_add
       return if !user_is_allowed('orders', 'add')
       order = Order.create(
+        :site_id => @site.id,
         :status => Order::STATUS_PENDING,                          
         :financial_status => Order::FINANCIAL_STATUS_PENDING
       )    

data/app/controllers/caboose/users_controller.rb

@@ -254,7 +254,7 @@ module Caboose
     # GET /admin/users/options
     def options
       return if !user_is_allowed('users', 'view')
-      @users = User.where('id <> 2').reorder('last_name, first_name').all
+      @users = User.where(:site_id => @site.id).reorder('last_name, first_name').all
       options = @users.collect { |u| { 'value' => u.id, 'text' => "#{u.first_name} #{u.last_name} (#{u.email})"}}
       render json: options
     end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.142'
+  VERSION = '0.5.143'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.142
+  version: 0.5.143
 platform: ruby
 authors:
 - William Barry