[FIX] website: do not restore page views
This commit is contained in:
parent
bbb8d8f25a
commit
c6f91facbb
|
@ -141,14 +141,19 @@ class Website(openerp.addons.web.controllers.main.Home):
|
||||||
modules_to_update = []
|
modules_to_update = []
|
||||||
for temp_id in templates:
|
for temp_id in templates:
|
||||||
view = request.registry['ir.ui.view'].browse(request.cr, request.uid, int(temp_id), context=request.context)
|
view = request.registry['ir.ui.view'].browse(request.cr, request.uid, int(temp_id), context=request.context)
|
||||||
|
if view.page:
|
||||||
|
continue
|
||||||
view.model_data_id.write({
|
view.model_data_id.write({
|
||||||
'noupdate': False
|
'noupdate': False
|
||||||
})
|
})
|
||||||
if view.model_data_id.module not in modules_to_update:
|
if view.model_data_id.module not in modules_to_update:
|
||||||
modules_to_update.append(view.model_data_id.module)
|
modules_to_update.append(view.model_data_id.module)
|
||||||
module_obj = request.registry['ir.module.module']
|
|
||||||
module_ids = module_obj.search(request.cr, request.uid, [('name', 'in', modules_to_update)], context=request.context)
|
if modules_to_update:
|
||||||
module_obj.button_immediate_upgrade(request.cr, request.uid, module_ids, context=request.context)
|
module_obj = request.registry['ir.module.module']
|
||||||
|
module_ids = module_obj.search(request.cr, request.uid, [('name', 'in', modules_to_update)], context=request.context)
|
||||||
|
if module_ids:
|
||||||
|
module_obj.button_immediate_upgrade(request.cr, request.uid, module_ids, context=request.context)
|
||||||
return request.redirect(redirect)
|
return request.redirect(redirect)
|
||||||
|
|
||||||
@http.route('/website/customize_template_toggle', type='json', auth='user', website=True)
|
@http.route('/website/customize_template_toggle', type='json', auth='user', website=True)
|
||||||
|
|
|
@ -137,7 +137,7 @@ class ir_http(orm.AbstractModel):
|
||||||
if 'qweb_exception' in values:
|
if 'qweb_exception' in values:
|
||||||
view = request.registry.get("ir.ui.view")
|
view = request.registry.get("ir.ui.view")
|
||||||
views = view._views_get(request.cr, request.uid, exception.qweb['template'], request.context)
|
views = view._views_get(request.cr, request.uid, exception.qweb['template'], request.context)
|
||||||
to_reset = [v for v in views if v.model_data_id.noupdate is True]
|
to_reset = [v for v in views if v.model_data_id.noupdate is True and not v.page]
|
||||||
values['views'] = to_reset
|
values['views'] = to_reset
|
||||||
elif code == 403:
|
elif code == 403:
|
||||||
logger.warn("403 Forbidden:\n\n%s", values['traceback'])
|
logger.warn("403 Forbidden:\n\n%s", values['traceback'])
|
||||||
|
|
Loading…
Reference in New Issue