[FIX] website: check that website.user_id is not falsy

This field should be required.

This commits closes #21997

@kangol: diff in addons/website/models/ir_http.py is for existing db
It can be ignored in master because required will be apply
This commit is contained in:
Paul Catinean
2018-01-10 13:09:32 +01:00
committed by Jeremy Kersten
parent eeea6e8667
commit eded3cfda8
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -40,7 +40,7 @@ class ir_http(orm.AbstractModel):
def _auth_method_public(self):
if not request.session.uid:
website = self.pool['website'].get_current_website(request.cr, openerp.SUPERUSER_ID, context=request.context)
if website:
if website and website.user_id:
request.uid = website.user_id.id
else:
request.uid = self.pool['ir.model.data'].xmlid_to_res_id(request.cr, openerp.SUPERUSER_ID, 'base', 'public_user')
+1 -1
View File
@@ -166,7 +166,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'),
'user_id': fields.many2one('res.users', string='Public User', required=True),
'compress_html': fields.boolean('Compress HTML'),
'cdn_activated': fields.boolean('Activate CDN for assets'),
'cdn_url': fields.char('CDN Base URL'),