[IMP] product style model renames, add user_id on website to be used in multiwebsite
bzr revid: al@openerp.com-20140130225853-6fgpmtaa8v1vr25x
This commit is contained in:
parent
566cb4c8ef
commit
3124343f04
|
@ -6,6 +6,7 @@
|
|||
<field name="company_id" ref="base.main_company"/>
|
||||
<field name="language_ids" eval="[(6, 0, [ ref('base.lang_en')])]"/>
|
||||
<field name="default_lang_id" ref="base.lang_en"/>
|
||||
<field name="user_id" ref="base.public_user"/>
|
||||
</record>
|
||||
|
||||
<record id="main_menu" model="website.menu">
|
||||
|
|
|
@ -125,6 +125,7 @@ class website(osv.osv):
|
|||
'social_youtube': fields.char('Youtube Account'),
|
||||
'social_googleplus': fields.char('Google+ Account'),
|
||||
'google_analytics_key': fields.char('Google Analytics Key'),
|
||||
'user_id': fields.many2one('res.users', string='Public User'),
|
||||
'public_user': fields.function(_get_public_user, relation='res.users', type='many2one', string='Public User'),
|
||||
'menu_id': fields.function(_get_menu, relation='website.menu', type='many2one', string='Main Menu',
|
||||
store= {
|
||||
|
|
|
@ -225,7 +225,7 @@ class Ecommerce(http.Controller):
|
|||
|
||||
styles = []
|
||||
try:
|
||||
style_obj = request.registry.get('website.product.style')
|
||||
style_obj = request.registry.get('product.style')
|
||||
style_ids = style_obj.search(request.cr, request.uid, [], context=request.context)
|
||||
styles = style_obj.browse(request.cr, request.uid, style_ids, context=request.context)
|
||||
except:
|
||||
|
@ -769,7 +769,7 @@ class Ecommerce(http.Controller):
|
|||
active = True
|
||||
break
|
||||
|
||||
style = request.registry.get('website.product.style').browse(request.cr, request.uid, style_id, context=request.context)
|
||||
style = request.registry.get('product.style').browse(request.cr, request.uid, style_id, context=request.context)
|
||||
|
||||
if remove:
|
||||
product.write({'website_style_ids': [(3, rid) for rid in remove]})
|
||||
|
|
|
@ -23,11 +23,11 @@
|
|||
<field name="state">open</field>
|
||||
</record>
|
||||
|
||||
<record id="website_sale.image_promo" model="website.product.style">
|
||||
<record id="website_sale.image_promo" model="product.style">
|
||||
<field name="name">Sale Ribbon</field>
|
||||
<field name="html_class">oe_ribbon_promo</field>
|
||||
</record>
|
||||
<record id="website_sale.image_full" model="website.product.style">
|
||||
<record id="website_sale.image_full" model="product.style">
|
||||
<field name="name">Image Full</field>
|
||||
<field name="html_class">oe_image_full</field>
|
||||
</record>
|
||||
|
|
|
@ -57,7 +57,7 @@ class product_template(osv.Model):
|
|||
'suggested_product_ids': fields.one2many('product.template', 'suggested_product_id', 'Suggested Products'),
|
||||
'website_size_x': fields.integer('Size X'),
|
||||
'website_size_y': fields.integer('Size Y'),
|
||||
'website_style_ids': fields.many2many('website.product.style', 'product_website_style_rel', 'product_id', 'style_id', 'Styles'),
|
||||
'website_style_ids': fields.many2many('product.style', 'product_website_style_rel', 'product_id', 'style_id', 'Styles'),
|
||||
'website_sequence': fields.integer('Sequence', help="Determine the display order in the Website E-commerce"),
|
||||
'website_url': fields.function(_website_url, string="Website url", type="char"),
|
||||
}
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
from openerp.osv import osv, fields
|
||||
|
||||
|
||||
class website_product_style(osv.Model):
|
||||
_name = "website.product.style"
|
||||
class product_style(osv.Model):
|
||||
_name = "product.style"
|
||||
_columns = {
|
||||
'name' : fields.char('Style Name', required=True, translate=True),
|
||||
'html_class': fields.char('HTML Classes'),
|
||||
|
|
|
@ -10,5 +10,5 @@ access_product_product_price_type_public,product.price.type.public,product.model
|
|||
access_product_attribute,product.attribute.public,website_sale.model_product_attribute,,1,0,0,0
|
||||
access_product_attribute_value,product.attribute.value.public,website_sale.model_product_attribute_value,,1,0,0,0
|
||||
access_product_attribute_line,product.attribute.line.public,website_sale.model_product_attribute_line,,1,0,0,0
|
||||
access_website_product_style,website.product.style.public,website_sale.model_website_product_style,,1,0,0,0
|
||||
access_product_style,product.style.public,website_sale.model_product_style,,1,0,0,0
|
||||
access_product_supplierinfo,product.supplierinfo.public,product.model_product_supplierinfo,,1,0,0,0
|
||||
|
|
|
Loading…
Reference in New Issue