Skip to content

Commit

Permalink
fixed #487, shop shows an error message[MySQL].
Browse files Browse the repository at this point in the history
  • Loading branch information
saberma committed Oct 11, 2012
1 parent 43082db commit 259f187
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/models/custom_collection.rb
Expand Up @@ -3,7 +3,7 @@ class CustomCollection < ActiveRecord::Base
include Models::Handle
belongs_to :shop
has_many :collection_products, dependent: :destroy , class_name: 'CustomCollectionProduct'
has_many :products , through: :collection_products, order: '"custom_collection_products"."position" asc' # 商店使用
has_many :products , through: :collection_products, order: 'custom_collection_products.position asc' # 商店使用
attr_accessible :title, :published, :handle, :body_html, :products_order, :products

validates_presence_of :title
Expand Down
4 changes: 2 additions & 2 deletions config/app_config.yml
Expand Up @@ -3,7 +3,7 @@ defaults: &defaults
from: "ShopQi<noreply@shopqi.com>"
support: "ShopQi Support<support@shopqi.com>"
domain:
host: lvh.me
host: 42foo.com
port: ''
record: 粤ICP备11089804号
wiki:
Expand All @@ -12,7 +12,7 @@ defaults: &defaults
development:
<<: *defaults
domain:
host: lvh.me
host: 42foo.com
port: ':4000'
record: 粤ICP备11089804号

Expand Down

0 comments on commit 259f187

Please sign in to comment.