radiant-shop-extension 0.92.10 → 0.92.11

data/VERSION

@@ -1 +1 @@
-0.92.10
+0.92.11

data/app/controllers/admin/shop/categories_controller.rb

@@ -166,7 +166,7 @@ private
     @shop_category.page = Page.new(
       :layout_id  => (Layout.find_by_name(Radiant::Config['shop.layout_category']).id rescue nil),
       :parent_id  => (Radiant::Config['shop.root_page_id'] rescue 1),
-      :parts      => [PagePart.new]
+      :parts      => [PagePart.new(:name => 'description')]
     )
     @shop_category.product_layout = (Layout.find_by_name(Radiant::Config['shop.layout_product']) rescue nil)
   end

data/app/controllers/admin/shop/products_controller.rb

@@ -223,7 +223,7 @@ private
     @shop_product.page = Page.new(
       :parent_id  => @shop_category.page_id,
       :layout_id  => @shop_category.product_layout_id,
-      :parts      => [PagePart.new]
+      :parts      => [PagePart.new(:name => 'description')]
     )
   end
   

data/app/models/shop_category.rb

@@ -16,9 +16,12 @@ class ShopCategory < ActiveRecord::Base
   
   validates_presence_of         :page
   
-  # Returns the title of the product's page
+  # Returns the title of the categories' page
   def name; page.title; end
   
+  # Returns the url of the categories' page
+  def url; page.url; end
+  
   # Returns the url of the page formatted as an sku
   def handle; ShopProduct.to_sku(page.url); end
   

data/app/models/shop_product.rb

@@ -24,6 +24,9 @@ class ShopProduct < ActiveRecord::Base
   # Returns the url of the page formatted as an sku
   def sku; self.class.to_sku(url) end
   
+  # Returns the url of the product's page
+  def url; page.url; end
+  
   # Returns category through the pages parent
   def category; page.parent.shop_category; end
   

data/lib/shop/tags/category.rb

@@ -42,13 +42,13 @@ module Shop
       
       tag 'shop:category:if_current' do |tag|
         
-        if tag.locals.page.shop_category == tag.locals.shop_category
+        if tag.globals.page.shop_category == tag.locals.shop_category
           # Looking at the shop_category generated page
           tag.expand
           
-        elsif tag.locals.page.shop_product.present?
+        elsif tag.globals.page.shop_product.present?
           # A product page
-          if tag.locals.page.shop_product.category == tag.locals.shop_category
+          if tag.globals.page.shop_product.category == tag.locals.shop_category
             # Where the products category is this category
             tag.expand
           end
@@ -58,14 +58,14 @@ module Shop
       
       tag 'shop:category:unless_current' do |tag|
         
-        if tag.locals.page.shop_product.present?
+        if tag.globals.page.shop_product.present?
           # A product page
-          if tag.locals.page.shop_product.category != tag.locals.shop_category
+          if tag.globals.page.shop_product.category != tag.locals.shop_category
             # Where the products category is this category
             tag.expand
           end
           
-        elsif tag.locals.page.shop_category != tag.locals.shop_category
+        elsif tag.globals.page.shop_category != tag.locals.shop_category
           # Looking at the shop_category generated page
           tag.expand
           

data/lib/shop/tags/product.rb

@@ -44,13 +44,13 @@ module Shop
       end
       
       tag 'shop:product:if_current' do |tag|
-        if tag.locals.page.shop_product == tag.locals.shop_product
+        if tag.globals.page.shop_product == tag.locals.shop_product
           tag.expand
         end
       end
       
       tag 'shop:product:unless_current' do |tag|
-        if tag.locals.page.shop_product != tag.locals.shop_product
+        if tag.globals.page.shop_product != tag.locals.shop_product
           tag.expand
         end
       end

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.92.10"
+  s.version = "0.92.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]
-  s.date = %q{2010-12-23}
+  s.date = %q{2010-12-29}
   s.description = %q{Radiant Shop is an attempt at a simple but complete store. It includes Products, Categories, Orders and Credit Card Payments}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 379
+  hash: 377
   prerelease: false
   segments: 
   - 0
   - 92
-  - 10
-  version: 0.92.10
+  - 11
+  version: 0.92.11
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 +08:00
+date: 2010-12-29 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency