caboose-cms 0.5.114 → 0.5.115

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmU2YjI4YmE2YzNjZTc2OGJkZjBhMjZhZWZjZDUzYzgyZGYyNDA3Ng==
+    ZDQxZTRhZWE2ODNhM2UwMmQ5OGQyZTcxNmNjM2MyY2JiZjA0NTNjNA==
   data.tar.gz: !binary |-
-    Y2EyYzJkYTJiMDRhZjliOTQxNjc0ZTQxYWI2Mjk1NjE1YzQ0NTY0Ng==
+    ZDI4OWVhYjM4ZGMxNDM3ZWNlM2U3ODE1MzA5MzRjYWQ5Y2U0NjA2Yw==
 SHA512:
   metadata.gz: !binary |-
-    YjlhYjczYzQ3MjI0NWVmMGNmYjFmYzY2NTA4ZjMwYjFhNjUxZWYxYjk2NDRm
-    NmE5ODA5NmJkNThhYmUxMGQyYjFiOTcyODAzZWZlMDYzOWUxMjVhZTdmMzNi
-    YmI2NWVhMjE2ZjJhZDViYjJjN2M2MjAxMWQ3YTliY2NmMWNkYjY=
+    OWU3YjRiNGE4ZjM4Yzc5MzdmYWY5NzM4MzdkMjJhYjZhNmRhZTU1Y2VhM2M2
+    NGVmOGQ1OTM5MTlmM2Q0YmYwZDMzY2I3MDNjMWYzYTFkNGVmZTk3YmYwNzBh
+    ZWEyMjcyNDFhMzg1NzE4OWM4MTIzZjI3YWZlNzY1ZmFkMjU1NTU=
   data.tar.gz: !binary |-
-    NGY5NDhiOWY2ZTllYzc3ZjAxOWUwODc0Yzk4NzQ1MzRhMjMxNDBjNjdlNDE2
-    NDc1MGE4MWYyZGZhNDJkMjdkMWZjYWI5ZTJjODAyNWFjNjVmOWE3OGMyYTk1
-    ZDE3MTM0YWM2MTQ0YWQzOTBhZDE2MTA4OTFkOWEzNDU3MjNmNmE=
+    MmQ4NWNjOTIyMTJhMDY3ZTdjNzY0YWI2NDg3NDliYzRhZDYxOTM3MTVlMTRl
+    NmNmYTI5MDM1ZDA5MjY2Y2Y1MDc5NjUyZDA2MTc3N2U5MTI1ZWY4YmM1MWEx
+    NjBmZjkxMzI0YzIyMjdiODZmNDY0M2FhZTBkNjFhOTFlZTNjNTk=

data/app/controllers/caboose/products_controller.rb

@@ -314,6 +314,7 @@ module Caboose
       params.each do |name,value|
         case name
           when 'site_id'            then product.site_id            = value
+          when 'vendor_id'          then product.vendor_id          = value
           when 'alternate_id'       then product.alternate_id       = value          
           when 'title'              then product.title              = value
           when 'caption'            then product.caption            = value

data/app/views/caboose/products/admin_edit_general.html.erb

@@ -9,8 +9,8 @@ p = @product
   <select id="vendor" data-product-id="<%= @product.id %>">
     <option>-- Select a Vendor --</option>
     
-    <% Caboose::Vendor.all.each do |vendor| %>
-      <option value="<%= vendor.id %>" <%= 'selected' if p.vendor_id && p.vendor_id == vendor.id %>><%= vendor.name%></option>
+    <% Caboose::Vendor.where(:site_id => @site.id).reorder(:name).all.each do |vendor| %>
+      <option value="<%= vendor.id %>" <%= 'selected' if p.vendor_id && p.vendor_id == vendor.id %>><%= vendor.name %></option>
     <% end %>
   </select>
 </p>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.114'
+  VERSION = '0.5.115'
 end

metadata

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