caboose-cms 0.5.6 → 0.5.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjM5NDdjM2NhOTc3MzhjZDk1NDI3NTYwZWRmNDAxZGEzNGUwYzJkZQ==
+    YzQ3NGMzNjNhNWE2NWYyNGZjNjk1MWQ2ZjJkNWJhNTMyYmU4YmJjMQ==
   data.tar.gz: !binary |-
-    NDUyMTQxN2VkYTYyMGQwYTJhM2E5MWUwZTRmNmM3ZjQ2MDQ0MDk2Ng==
+    MTZjMzAxMGUxYTFhNDY3ZWY5NGY4NzJhMmViZGU0MjQxZjI4NWRhMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjljMzZmMDZlYzEwMjJhYWUzZWY3ZmI2NDVmZWQxYTI2MjkzMWNmYmI2OWE0
-    YmY2ZmVlMjg5YzIzNDg1MmNlZjZjMWRmYzUyNjc5ZGZmOWI2NjRhMzYwNjNl
-    ZjdkYjZhMjAyZDBjNGY0M2NjOTE1YWExOWY1OTNiZGE0ZDI5MjE=
+    YjAyNWIzOWIyNTdlNDgwMjFkMjljODcyYjIyNzhjYjRlNGMxNjZhNjgxM2Zj
+    MWJhNWU0ZTIxMzBhYzliODliN2U5MTU4NTUwNGQ4ZTJiMTVkMjkxM2UzNTM3
+    Y2QwZThhODg0MDIyYTViMDMzNzEzODA2ZDFiMzQ0YTBhYWE0Nzc=
   data.tar.gz: !binary |-
-    NDllYmUzMDlmZWIxNjc5NGQ2OTgwNzI1YjFjNzk3ZmVhZTkyZDJlYmM5Yjc3
-    ZmU0YTc0OGQxMTgwNTM0YTU4NDNiZWFhOWQwM2UwZjlkNjcxOTUyYjAwMjM1
-    NGJiNDhhNjY5ZWRjNGM5OWRhMTY3ODc0YjEyM2FmZmI4YWY1MGY=
+    OWNjNDk4YjhlNGIyNGFiMDM0OGVjMDA5MWU1YWMzNWIxYmQzYmI1NTYyZmRk
+    ZTM4OGE2YTExYmNjZTU1MjEyNWI3MDg4YTBjZWVhY2JkNjU3Y2M3MTM1NDM5
+    YWE5ZmE1Nzg1ZjUwZGVhN2MzYmMxZTAxM2RmYTM5YWM4OWFiMDE=

data/app/controllers/caboose/products_controller.rb

@@ -323,7 +323,7 @@ module Caboose
       })
       render :json => {
         :pager => pager,
-        :models => pager.items.as_json(:includes => [:vendor, :categories])
+        :models => pager.items
       }      
     end
     
@@ -348,7 +348,7 @@ module Caboose
     # GET /admin/products/:id/json
     def admin_json_single
       p = Product.find(params[:id])
-      render :json => p.as_json(:includes => [:vendor, :categories])
+      render :json => p      
     end
     
     # GET /admin/products/:id/general

data/app/models/caboose/product.rb

@@ -63,6 +63,8 @@ module Caboose
     
     def as_json(options={})
       self.attributes.merge({
+        :vendor => self.vendor,
+        :categories => self.categories,
         :variants => self.variants,
         :images => self.product_images
       })

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

metadata

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