diff options
Diffstat (limited to 'addons/website/models/website.py')
| -rw-r--r-- | addons/website/models/website.py | 459 |
1 files changed, 327 insertions, 132 deletions
diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 94d73420ccf..913334fc086 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -15,6 +15,7 @@ from odoo.addons.website.models.ir_http import sitemap_qs2dom from odoo.addons.portal.controllers.portal import pager from odoo.tools import pycompat from odoo.http import request +from odoo.osv import expression from odoo.osv.expression import FALSE_DOMAIN from odoo.tools.translate import _ @@ -33,9 +34,13 @@ DEFAULT_CDN_FILTERS = [ class Website(models.Model): - _name = "website" # Avoid website.website convention for conciseness (for new api). Got a special authorization from xmo and rco + _name = "website" _description = "Website" + @api.model + def website_domain(self, website_id=False): + return [('website_id', 'in', (False, website_id or self.id))] + def _active_languages(self): return self.env['res.lang'].search([]).ids @@ -44,33 +49,64 @@ class Website(models.Model): def_lang = self.env['res.lang'].search([('code', '=', lang_code)], limit=1) return def_lang.id if def_lang else self._active_languages()[0] + def _default_social_twitter(self): + return self.env.ref('base.main_company').social_twitter + + def _default_social_facebook(self): + return self.env.ref('base.main_company').social_facebook + + def _default_social_github(self): + return self.env.ref('base.main_company').social_github + + def _default_social_linkedin(self): + return self.env.ref('base.main_company').social_linkedin + + def _default_social_youtube(self): + return self.env.ref('base.main_company').social_youtube + + def _default_social_googleplus(self): + return self.env.ref('base.main_company').social_googleplus + name = fields.Char('Website Name') domain = fields.Char('Website Domain') + country_group_ids = fields.Many2many('res.country.group', 'website_country_group_rel', 'website_id', 'country_group_id', + string='Country Groups', help='Used when multiple websites have the same domain.') company_id = fields.Many2one('res.company', string="Company", default=lambda self: self.env.ref('base.main_company').id) language_ids = fields.Many2many('res.lang', 'website_lang_rel', 'website_id', 'lang_id', 'Languages', default=_active_languages) default_lang_id = fields.Many2one('res.lang', string="Default Language", default=_default_language, required=True) - default_lang_code = fields.Char(related='default_lang_id.code', string="Default language code", store=True) + default_lang_code = fields.Char("Default language code", related='default_lang_id.code', store=True) auto_redirect_lang = fields.Boolean('Autoredirect Language', default=True, help="Should users be redirected to their browser's language") - social_twitter = fields.Char(related="company_id.social_twitter") - social_facebook = fields.Char(related="company_id.social_facebook") - social_github = fields.Char(related="company_id.social_github") - social_linkedin = fields.Char(related="company_id.social_linkedin") - social_youtube = fields.Char(related="company_id.social_youtube") - social_googleplus = fields.Char(related="company_id.social_googleplus") + social_twitter = fields.Char('Twitter Account', default=_default_social_twitter) + social_facebook = fields.Char('Facebook Account', default=_default_social_facebook) + social_github = fields.Char('GitHub Account', default=_default_social_github) + social_linkedin = fields.Char('LinkedIn Account', default=_default_social_linkedin) + social_youtube = fields.Char('Youtube Account', default=_default_social_youtube) + social_googleplus = fields.Char('Google+ Account', default=_default_social_googleplus) google_analytics_key = fields.Char('Google Analytics Key') google_management_client_id = fields.Char('Google Client ID') google_management_client_secret = fields.Char('Google Client Secret') - user_id = fields.Many2one('res.users', string='Public User', required=True, default=lambda self: self.env.ref('base.public_user').id) - cdn_activated = fields.Boolean('Activate CDN for assets') + google_maps_api_key = fields.Char('Google Maps API Key') + has_google_analytics = fields.Boolean("Google Analytics") + has_google_analytics_dashboard = fields.Boolean("Embedded Google Analytics") + has_google_maps = fields.Boolean("Google Maps") + + user_id = fields.Many2one('res.users', string='Public User', required=True) + cdn_activated = fields.Boolean('Content Delivery Network (CDN)') cdn_url = fields.Char('CDN Base URL', default='') cdn_filters = fields.Text('CDN Filters', default=lambda s: '\n'.join(DEFAULT_CDN_FILTERS), help="URL matching those filters will be rewritten using the CDN Base URL") partner_id = fields.Many2one(related='user_id.partner_id', relation='res.partner', string='Public Partner') menu_id = fields.Many2one('website.menu', compute='_compute_menu', string='Main Menu') homepage_id = fields.Many2one('website.page', string='Homepage') favicon = fields.Binary(string="Website Favicon", help="This field holds the image used to display a favicon on the website.") + theme_id = fields.Many2one('ir.module.module', help='Installed theme') + + auth_signup_uninvited = fields.Selection([ + ('b2b', 'On invitation'), + ('b2c', 'Free sign up'), + ], string='Customer Account', default='b2b') @api.multi def _compute_menu(self): @@ -82,18 +118,69 @@ class Website(models.Model): def noop(self, *args, **kwargs): pass + @api.model + def create(self, vals): + if 'user_id' not in vals: + company = self.env['res.company'].browse(vals.get('company_id')) + vals['user_id'] = company._get_public_user().id if company else self.env.ref('base.public_user').id + + res = super(Website, self).create(vals) + res._bootstrap_homepage() + return res + @api.multi def write(self, values): self._get_languages.clear_cache(self) + if 'company_id' in values and 'user_id' not in values: + company = self.env['res.company'].browse(values['company_id']) + values['user_id'] = company._get_public_user().id + result = super(Website, self).write(values) if 'cdn_activated' in values or 'cdn_url' in values or 'cdn_filters' in values: # invalidate the caches from static node at compile time self.env['ir.qweb'].clear_caches() return result - #---------------------------------------------------------- + @api.onchange('company_id') + def _onchange_company_id(self): + self.social_twitter = self.company_id.social_twitter + self.social_facebook = self.company_id.social_facebook + self.social_github = self.company_id.social_github + self.social_linkedin = self.company_id.social_linkedin + self.social_youtube = self.company_id.social_youtube + self.social_googleplus = self.company_id.social_googleplus + + # ---------------------------------------------------------- # Page Management - #---------------------------------------------------------- + # ---------------------------------------------------------- + def _bootstrap_homepage(self): + standard_homepage = self.env.ref('website.homepage', raise_if_not_found=False) + if not standard_homepage: + return + + new_homepage_view = '''<t name="Homepage" t-name="website.homepage%s"> + <t t-call="website.layout"> +%s + </t> +</t>''' % (self.id, self.env['ir.ui.view'].render_template('website.default_homepage', values={'website': self}).decode()) + standard_homepage.with_context(website_id=self.id).arch_db = new_homepage_view + + self.homepage_id = self.env['website.page'].search([('website_id', '=', self.id), + ('key', '=', standard_homepage.key)]) + top_menu = self.env['website.menu'].create({ + 'name': _('Top Menu for website %s') % self.id, + 'website_id': self.id, + 'sequence': 0 + }) + self.menu_id = top_menu.id + self.env['website.menu'].create({ + 'name': _('Home'), + 'url': '/', + 'website_id': self.id, + 'parent_id': top_menu.id, + 'sequence': 10 + }) + @api.model def new_page(self, name=False, add_menu=False, template='website.default_page', ispage=True, namespace=None): """ Create a new website page, and assign it a xmlid based on the given one @@ -127,20 +214,21 @@ class Website(models.Model): if view.arch_fs: view.arch_fs = False + website = self.get_current_website() if ispage: page = self.env['website.page'].create({ 'url': page_url, - 'website_ids': [(6, None, [self.get_current_website().id])], - 'view_id': view.id + 'website_id': website.id, # remove it if only one webiste or not? + 'view_id': view.id, }) result['view_id'] = view.id if add_menu: self.env['website.menu'].create({ 'name': name, 'url': page_url, - 'parent_id': self.get_current_website().menu_id.id, + 'parent_id': website.menu_id.id, 'page_id': page.id, - 'website_id': self.get_current_website().id, + 'website_id': website.id, }) return result @@ -152,9 +240,11 @@ class Website(models.Model): """ Given an url, return that url suffixed by counter if it already exists :param page_url : the url to be checked for uniqueness """ - website_id = self.get_current_website().id inc = 0 - domain_static = ['|', ('website_ids', '=', False), ('website_ids', 'in', website_id)] + # we only want a unique_path for website specific. + # we need to be able to have /url for website=False, and /url for website=1 + # in case of duplicate, page manager will allow you to manage this case + domain_static = [('website_id', '=', self.get_current_website().id)] # .website_domain() page_temp = page_url while self.env['website.page'].with_context(active_test=False).sudo().search([('url', '=', page_temp)] + domain_static): inc += 1 @@ -167,17 +257,16 @@ class Website(models.Model): :param string : the key to be checked for uniqueness, you can pass it with 'website.' or not :param template_module : the module to be prefixed on the key, if not set, we will use website """ - website_id = self.get_current_website().id if template_module: string = template_module + '.' + string else: if not string.startswith('website.'): string = 'website.' + string - #Look for unique key + # Look for unique key key_copy = string inc = 0 - domain_static = ['|', ('website_ids', '=', False), ('website_ids', 'in', website_id)] + domain_static = self.get_current_website().website_domain() while self.env['website.page'].with_context(active_test=False).sudo().search([('key', '=', key_copy)] + domain_static): inc += 1 key_copy = string + (inc and "-%s" % inc or "") @@ -185,10 +274,8 @@ class Website(models.Model): def key_to_view_id(self, view_id): return self.env['ir.ui.view'].search([ - ('id', '=', view_id), - '|', ('website_id', '=', self._context.get('website_id')), ('website_id', '=', False), - ('type', '=', 'qweb') - ]) + ('id', '=', view_id), ('type', '=', 'qweb') + ] + self.env['website'].website_domain(self._context.get('website_id'))) @api.model def page_search_dependencies(self, page_id=False): @@ -203,13 +290,11 @@ class Website(models.Model): return dependencies page = self.env['website.page'].browse(int(page_id)) - website_id = self._context.get('website_id') + website = self.env['website'].browse(self._context.get('website_id')) url = page.url # search for website_page with link - website_page_search_dom = [ - '|', ('website_ids', 'in', website_id), ('website_ids', '=', False), ('view_id.arch_db', 'ilike', url) - ] + website_page_search_dom = [('view_id.arch_db', 'ilike', url)] + website.website_domain() pages = self.env['website.page'].search(website_page_search_dom) page_key = _('Page') if len(pages) > 1: @@ -225,10 +310,7 @@ class Website(models.Model): page_view_ids.append(page.view_id.id) # search for ir_ui_view (not from a website_page) with link - page_search_dom = [ - '|', ('website_id', '=', website_id), ('website_id', '=', False), - ('arch_db', 'ilike', url), ('id', 'not in', page_view_ids) - ] + page_search_dom = [('arch_db', 'ilike', url), ('id', 'not in', page_view_ids)] + website.website_domain() views = self.env['ir.ui.view'].search(page_search_dom) view_key = _('Template') if len(views) > 1: @@ -241,9 +323,7 @@ class Website(models.Model): 'item': _('%s (id:%s)') % (view.key or view.name, view.id), }) # search for menu with link - menu_search_dom = [ - '|', ('website_id', '=', website_id), ('website_id', '=', False), ('url', 'ilike', '%s' % url) - ] + menu_search_dom = [('url', 'ilike', '%s' % url)] + website.website_domain() menus = self.env['website.menu'].search(menu_search_dom) menu_key = _('Menu') @@ -271,14 +351,14 @@ class Website(models.Model): return dependencies page = self.env['website.page'].browse(int(page_id)) - website_id = self._context.get('website_id') + website = self.env['website'].browse(self._context.get('website_id')) key = page.key # search for website_page with link website_page_search_dom = [ - '|', ('website_ids', 'in', website_id), ('website_ids', '=', False), ('view_id.arch_db', 'ilike', key), - ('id', '!=', page.id), - ] + ('view_id.arch_db', 'ilike', key), + ('id', '!=', page.id) + ] + website.website_domain() pages = self.env['website.page'].search(website_page_search_dom) page_key = _('Page') if len(pages) > 1: @@ -295,10 +375,9 @@ class Website(models.Model): # search for ir_ui_view (not from a website_page) with link page_search_dom = [ - '|', ('website_id', '=', website_id), ('website_id', '=', False), ('arch_db', 'ilike', key), ('id', 'not in', page_view_ids), ('id', '!=', page.view_id.id), - ] + ] + website.website_domain() views = self.env['ir.ui.view'].search(page_search_dom) view_key = _('Template') if len(views) > 1: @@ -306,26 +385,27 @@ class Website(models.Model): for view in views: dependencies.setdefault(view_key, []) dependencies[view_key].append({ - 'text': _('Template <b>%s (id:%s)</b> is calling this file') % (view.key or view.name, view.id), - 'item': _('%s (id:%s)') % (view.key or view.name, view.id), - 'link': '/web#id=%s&view_type=form&model=ir.ui.view' % view.id, + 'text': _('Template <b>%s (id:%s)</b> is calling this file') % (view.key or view.name, view.id), + 'item': _('%s (id:%s)') % (view.key or view.name, view.id), + 'link': '/web#id=%s&view_type=form&model=ir.ui.view' % view.id, }) return dependencies - @api.model - def page_exists(self, name, module='website'): - try: - name = (name or "").replace("/website.", "").replace("/", "") - if not name: - return False - return self.env.ref('%s.%s' % module, name) - except Exception: - return False - - #---------------------------------------------------------- + # removed by 3c9e6c89e7207636c1bdab4ed8118c0c1089d43e + # @api.model + # def page_exists(self, name, module='website'): + # try: + # name = (name or "").replace("/website.", "").replace("/", "") + # if not name: + # return False + # return self.env.ref('%s.%s' % module, name) + # except Exception: + # return False + + # ---------------------------------------------------------- # Languages - #---------------------------------------------------------- + # ---------------------------------------------------------- @api.multi def get_languages(self): @@ -370,25 +450,46 @@ class Website(models.Model): lang['hreflang'] = lang['short'] return langs - #---------------------------------------------------------- + # ---------------------------------------------------------- # Utilities - #---------------------------------------------------------- + # ---------------------------------------------------------- @api.model def get_current_website(self): + if request and request.session.get('force_website_id'): + return self.browse(request.session['force_website_id']) + domain_name = request and request.httprequest.environ.get('HTTP_HOST', '').split(':')[0] or None - website_id = self._get_current_website_id(domain_name) + + country = request.session.geoip.get('country_code') if request and request.session.geoip else False + country_id = False + if country: + country_id = request.env['res.country'].search([('code', '=', country)], limit=1).id + + website_id = self._get_current_website_id(domain_name, country_id) if request: request.context = dict(request.context, website_id=website_id) return self.browse(website_id) - @tools.cache('domain_name') - def _get_current_website_id(self, domain_name): - """ Reminder : cached method should be return record, since they will use a closed cursor. """ - website = self.search([('domain', '=', domain_name)], limit=1) - if not website: - website = self.search([], limit=1) - return website.id + @tools.cache('domain_name', 'country_id') + def _get_current_website_id(self, domain_name, country_id): + # sort on country_group_ids so that we fall back on a generic website (empty country_group_ids) + websites = self.search([('domain', '=', domain_name)]).sorted('country_group_ids') + + if not websites: + return self.search([], limit=1).id + elif len(websites) == 1: + return websites.id + else: # > 1 website with the same domain + country_specific_websites = websites.filtered(lambda website: country_id in website.country_group_ids.mapped('country_ids').ids) + return country_specific_websites[0].id if country_specific_websites else websites[0].id + + def _force(self): + self._force_website(self.id) + + def _force_website(self, website_id): + if request: + request.session['force_website_id'] = website_id and int(website_id) @api.model def is_publisher(self): @@ -429,13 +530,12 @@ class Website(models.Model): methods = endpoint.routing.get('methods') or ['GET'] converters = list(rule._converters.values()) - if not ('GET' in methods - and endpoint.routing['type'] == 'http' - and endpoint.routing['auth'] in ('none', 'public') - and endpoint.routing.get('website', False) - and all(hasattr(converter, 'generate') for converter in converters) - and endpoint.routing.get('website')): - return False + if not ('GET' in methods and + endpoint.routing['type'] == 'http' and + endpoint.routing['auth'] in ('none', 'public') and + endpoint.routing.get('website', False) and + all(hasattr(converter, 'generate') for converter in converters)): + return False # dont't list routes without argument having no default value or converter spec = inspect.getargspec(endpoint.method.original_func) @@ -495,7 +595,7 @@ class Website(models.Model): for (i, (name, converter)) in enumerate(convitems): newval = [] for val in values: - query = i == len(convitems)-1 and query_string + query = i == len(convitems) - 1 and query_string if query: r = "".join([x[1] for x in rule._trace[1:] if not x[0]]) # remove model converter from route query = sitemap_qs2dom(query, r, self.env[converter.model]._rec_name) @@ -527,7 +627,7 @@ class Website(models.Model): domain = [('url', '!=', '/')] if not force: domain += [('website_indexed', '=', True)] - #is_visible + # is_visible domain += [('website_published', '=', True), '|', ('date_publish', '=', False), ('date_publish', '<=', fields.Datetime.now())] if query_string: @@ -545,7 +645,7 @@ class Website(models.Model): @api.multi def get_website_pages(self, domain=[], order='name', limit=None): - domain += ['|', ('website_ids', 'in', self.get_current_website().id), ('website_ids', '=', False)] + domain += self.get_current_website().website_domain() pages = request.env['website.page'].search(domain, order='name', limit=limit) return pages @@ -595,11 +695,28 @@ class SeoMetadata(models.AbstractModel): website_meta_keywords = fields.Char("Website meta keywords", translate=True) +class WebsiteMultiMixin(models.AbstractModel): + + _name = 'website.multi.mixin' + + website_id = fields.Many2one('website', string='Website', help='Restrict publishing to this website.') + + @api.multi + def can_access_from_current_website(self, website_id=False): + can_access = True + for record in self: + if (website_id or record.website_id.id) not in (False, request.website.id): + can_access = False + continue + return can_access + + class WebsitePublishedMixin(models.AbstractModel): _name = "website.published.mixin" - website_published = fields.Boolean('Visible in Website', copy=False) + website_published = fields.Boolean('Visible on current website', related='is_published') + is_published = fields.Boolean('Is published') website_url = fields.Char('Website URL', compute='_compute_website_url', help='The full URL to access the document through the website.') @api.multi @@ -611,6 +728,9 @@ class WebsitePublishedMixin(models.AbstractModel): def website_publish_button(self): self.ensure_one() if self.env.user.has_group('website.group_website_publisher') and self.website_url != '#': + # Force website to land on record's website to publish/unpublish it + if 'website_id' in self and self.env.user.has_group('website.group_multi_website'): + self.website_id._force() return self.open_website_url() return self.write({'website_published': not self.website_published}) @@ -622,14 +742,56 @@ class WebsitePublishedMixin(models.AbstractModel): } +class WebsitePublishedMultiMixin(WebsitePublishedMixin): + + _name = 'website.published.multi.mixin' + _inherit = ['website.published.mixin', 'website.multi.mixin'] + + website_published = fields.Boolean(compute='_compute_website_published', + inverse='_inverse_website_published', + search='_search_website_published', + related=False) + + @api.multi + @api.depends('is_published', 'website_id') + def _compute_website_published(self): + current_website_id = self._context.get('website_id') + for record in self: + if current_website_id: + record.website_published = record.is_published and (not record.website_id or record.website_id.id == current_website_id) + else: + record.website_published = record.is_published + + @api.multi + def _inverse_website_published(self): + for record in self: + record.is_published = record.website_published + + def _search_website_published(self, operator, value): + if not isinstance(value, bool) or operator not in ('=', '!='): + logger.warning('unsupported search on website_published: %s, %s', operator, value) + return [()] + + if operator in expression.NEGATIVE_TERM_OPERATORS: + value = not value + + current_website_id = self._context.get('website_id') + is_published = [('is_published', '=', value)] + if current_website_id: + on_current_website = self.env['website'].website_domain(current_website_id) + return (['!'] if value is False else []) + expression.AND([is_published, on_current_website]) + else: # should be in the backend, return things that are published anywhere + return is_published + + class Page(models.Model): _name = 'website.page' _inherits = {'ir.ui.view': 'view_id'} - _inherit = 'website.published.mixin' + _inherit = 'website.published.multi.mixin' _description = 'Page' + _order = 'website_id' url = fields.Char('Page URL') - website_ids = fields.Many2many('website', string='Websites') view_id = fields.Many2one('ir.ui.view', string='View', required=True, ondelete="cascade") website_indexed = fields.Boolean('Page Indexed', default=True) date_publish = fields.Datetime('Publishing Date') @@ -642,6 +804,9 @@ class Page(models.Model): header_overlay = fields.Boolean() header_color = fields.Char() + # don't use mixin website_id but use website_id on ir.ui.view instead + website_id = fields.Many2one(related='view_id.website_id', store=True) + @api.one def _compute_homepage(self): self.is_homepage = self == self.env['website'].get_current_website().homepage_id @@ -660,11 +825,21 @@ class Page(models.Model): def _compute_visible(self): self.is_visible = self.website_published and (not self.date_publish or self.date_publish < fields.Datetime.now()) + @api.multi + def _is_most_specific_page(self, page_to_test): + '''This will test if page_to_test is the most specific page in self.''' + pages_for_url = self.sorted(key=lambda p: not p.website_id).filtered(lambda page: page.url == page_to_test.url) + + # this works because pages are _order'ed by website_id + most_specific_page = pages_for_url[0] + + return most_specific_page == page_to_test + @api.model - def get_page_info(self, id, website_id): - domain = ['|', ('website_ids', 'in', website_id), ('website_ids', '=', False), ('id', '=', id)] - item = self.search_read(domain, fields=['id', 'name', 'url', 'website_published', 'website_indexed', 'date_publish', 'menu_ids', 'is_homepage'], limit=1) - return item + def get_page_info(self, id): + return self.browse(id).read( + ['id', 'name', 'url', 'website_published', 'website_indexed', 'date_publish', 'menu_ids', 'is_homepage', 'website_id'], + ) @api.multi def get_view_identifier(self): @@ -676,7 +851,7 @@ class Page(models.Model): website = self.env['website'].browse(website_id) page = self.browse(int(data['id'])) - #If URL has been edited, slug it + # If URL has been edited, slug it original_url = page.url url = data['url'] if not url.startswith('/'): @@ -685,7 +860,7 @@ class Page(models.Model): url = '/' + slugify(url, max_length=1024, path=True) url = self.env['website'].get_unique_path(url) - #If name has changed, check for key uniqueness + # If name has changed, check for key uniqueness if page.name != data['name']: page_key = self.env['website'].get_unique_key(slugify(data['name'])) else: @@ -693,11 +868,11 @@ class Page(models.Model): menu = self.env['website.menu'].search([('page_id', '=', int(data['id']))]) if not data['is_menu']: - #If the page is no longer in menu, we should remove its website_menu + # If the page is no longer in menu, we should remove its website_menu if menu: menu.unlink() else: - #The page is now a menu, check if has already one + # The page is now a menu, check if has already one if menu: menu.write({'url': url}) else: @@ -709,15 +884,23 @@ class Page(models.Model): 'website_id': website.id, }) - page.write({ + # Edits via the page manager shouldn't trigger the COW + # mechanism and generate new pages. The user manages page + # visibility manually with is_published here. + w_vals = { 'key': page_key, 'name': data['name'], 'url': url, - 'website_published': data['website_published'], + 'is_published': data['website_published'], + 'website_id': False if data['share_page_info'] else website.id, 'website_indexed': data['website_indexed'], 'date_publish': data['date_publish'] or None, 'is_homepage': data['is_homepage'], - }) + } + # toggle is hidden to prevent user to unshare a page + if 'share_page_info' in data: + w_vals['website_id'] = False if data['share_page_info'] else website.id + page.with_context(no_cow=True).write(w_vals) # Create redirect if needed if data['create_redirect']: @@ -733,17 +916,14 @@ class Page(models.Model): @api.multi @api.returns('self', lambda value: value.id) def copy(self, default=None): - view = self.env['ir.ui.view'].browse(self.view_id.id) - # website.page's ir.ui.view should have a different key than the one it - # is copied from. - # (eg: website_version: an ir.ui.view record with the same key is - # expected to be the same ir.ui.view but from another version) - new_view = view.copy({'key': view.key + '.copy', 'name': '%s %s' % (view.name, _('(copy)'))}) - default = { - 'name': '%s %s' % (self.name, _('(copy)')), - 'url': self.env['website'].get_unique_path(self.url), - 'view_id': new_view.id, - } + if default: + if not default.get('view_id'): + view = self.env['ir.ui.view'].browse(self.view_id.id) + new_view = view.copy({'website_id': default.get('website_id')}) + default['view_id'] = new_view.id + + default['name'] = default.get('name', '%s %s' % (self.name, _('(copy)'))) + default['url'] = default.get('url', self.env['website'].get_unique_path(self.url)) return super(Page, self).copy(default=default) @api.model @@ -752,53 +932,38 @@ class Page(models.Model): :param page_id : website.page identifier """ page = self.browse(int(page_id)) - new_page = page.copy() - if clone_menu: + new_page = page.copy(dict(website_id=self.env['website'].get_current_website().id)) + # Should not clone menu if the page was cloned from one website to another + # Eg: Cloning a generic page (no website) will create a page with a website, we can't clone menu (not same container) + if clone_menu and new_page.website_id == page.website_id: menu = self.env['website.menu'].search([('page_id', '=', page_id)], limit=1) if menu: # If the page being cloned has a menu, clone it too new_menu = menu.copy() - new_menu.write({'url': new_page.url, 'name': '%s %s' % (menu.name, _('(copy)')), 'page_id': new_page.id}) + new_menu.write({'url': new_page.url, 'name': '%s %s' % (menu.name, _('(copy)')), 'page_id': new_page.id}) return new_page.url + '?enable_editor=1' @api.multi def unlink(self): - """ When a website_page is deleted, the ORM does not delete its ir_ui_view. - So we got to delete it ourself, but only if the ir_ui_view is not used by another website_page. - """ - # Handle it's ir_ui_view + # When a website_page is deleted, the ORM does not delete its + # ir_ui_view. So we got to delete it ourself, but only if the + # ir_ui_view is not used by another website_page. for page in self: # Other pages linked to the ir_ui_view of the page being deleted (will it even be possible?) pages_linked_to_iruiview = self.search( - [('view_id', '=', self.view_id.id), ('id', '!=', self.id)] + [('view_id', '=', page.view_id.id), ('id', '!=', page.id)] ) - if len(pages_linked_to_iruiview) == 0: + if len(pages_linked_to_iruiview) == 0 and not page.view_id.inherit_children_ids: # If there is no other pages linked to that ir_ui_view, we can delete the ir_ui_view - self.env['ir.ui.view'].search([('id', '=', self.view_id.id)]).unlink() - # And then delete the website_page itself + page.view_id.unlink() return super(Page, self).unlink() - @api.model - def delete_page(self, page_id): - """ Delete a page, given its identifier - :param page_id : website.page identifier - """ - # If we are deleting a page (that could possibly be a menu with a page) - page = self.env['website.page'].browse(int(page_id)) - if page: - # Check if it is a menu with a page and also delete menu if so - menu = self.env['website.menu'].search([('page_id', '=', page.id)], limit=1) - if menu: - menu.unlink() - page.unlink() - @api.multi def write(self, vals): if 'url' in vals and not vals['url'].startswith('/'): vals['url'] = '/' + vals['url'] - result = super(Page, self).write(vals) - return result + return super(Page, self).write(vals) class Menu(models.Model): @@ -815,15 +980,45 @@ class Menu(models.Model): name = fields.Char('Menu', required=True, translate=True) url = fields.Char('Url', default='') - page_id = fields.Many2one('website.page', 'Related Page') + page_id = fields.Many2one('website.page', 'Related Page', ondelete='cascade') new_window = fields.Boolean('New Window') sequence = fields.Integer(default=_default_sequence) - website_id = fields.Many2one('website', 'Website') # TODO: support multiwebsite once done for ir.ui.views + website_id = fields.Many2one('website', 'Website') parent_id = fields.Many2one('website.menu', 'Parent Menu', index=True, ondelete="cascade") child_id = fields.One2many('website.menu', 'parent_id', string='Child Menus') parent_path = fields.Char(index=True) is_visible = fields.Boolean(compute='_compute_visible', string='Is Visible') + @api.multi + def name_get(self): + res = [] + for menu in self: + website_suffix = '%s - %s' % (menu.name, menu.website_id.name) + res.append((menu.id, website_suffix if menu.website_id and self.env.user.has_group('website.group_multi_website') else menu.name)) + return res + + @api.model + def create(self, vals): + ''' In case a menu without a website_id is trying to be created, we duplicate + it for every website. + Note: Particulary useful when installing a module that adds a menu like + /shop. So every website has the shop menu. + ''' + if vals.get('website_id'): + return super(Menu, self).create(vals) + elif self._context.get('website_id'): + vals['website_id'] = self._context.get('website_id') + return super(Menu, self).create(vals) + else: + # create for every site + for website in self.env['website'].search([]): + vals.update({ + 'website_id': website.id, + 'parent_id': website.menu_id.id, + }) + res = super(Menu, self).create(vals) + return res # Only one record is returned but multiple could have been created + @api.one def _compute_visible(self): visible = True @@ -886,7 +1081,7 @@ class Menu(models.Model): mid = menu['id'] # new menu are prefixed by new- if isinstance(mid, pycompat.string_types): - new_menu = self.create({'name': menu['name']}) + new_menu = self.create({'name': menu['name'], 'website_id': website_id}) replace_id(mid, new_menu.id) for menu in data['data']: menu_id = self.browse(menu['id']) |