From 2431e2a9ea756a79e9145780a0b2cccb9a540db3 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 22 Aug 2018 09:51:46 +0200 Subject: [PATCH] [FIX] web_editor, website: remove useless code / comment Rebase failed, these lines should be no more there. --- addons/web_editor/controllers/main.py | 7 ------- addons/website/models/ir_ui_view.py | 1 - 2 files changed, 8 deletions(-) diff --git a/addons/web_editor/controllers/main.py b/addons/web_editor/controllers/main.py index 9509a541c88..7dbc3415f21 100644 --- a/addons/web_editor/controllers/main.py +++ b/addons/web_editor/controllers/main.py @@ -146,9 +146,6 @@ class Web_Editor(http.Controller): # therefore we have to recover the files from the request object Attachments = request.env['ir.attachment'] # registry for the attachment table - website = request.env['website'].get_current_website() # # TO MOVE - - res_model = kwargs.get('res_model', 'ir.ui.view') if res_model != 'ir.ui.view' and kwargs.get('res_id'): res_id = int(kwargs['res_id']) @@ -170,8 +167,6 @@ class Web_Editor(http.Controller): 'public': res_model == 'ir.ui.view', 'res_id': res_id, 'res_model': res_model, - 'website_id': website.id, - }) attachment.generate_access_token() uploads += attachment.read(['name', 'mimetype', 'checksum', 'url', 'res_id', 'res_model', 'access_token']) @@ -203,8 +198,6 @@ class Web_Editor(http.Controller): 'public': res_model == 'ir.ui.view', 'res_id': res_id, 'res_model': res_model, - 'website_id': website.id, # TO MOVE IN WEBSITEID - }) attachment.generate_access_token() attachments += attachment diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index 00354a43613..933417c236f 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -23,7 +23,6 @@ class View(models.Model): website_id = fields.Many2one('website', ondelete='cascade', string="Website") page_ids = fields.One2many('website.page', 'view_id') first_page_id = fields.Many2one('website.page', string='Website Page', help='First page linked to this view', compute='_compute_first_page_id') - # theme_id = fields.Many2one('ir.module.module') @api.multi def _compute_first_page_id(self):