[FIX] web_editor, website: remove useless code / comment
Rebase failed, these lines should be no more there.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user