Romain DerieandJeremy Kersten
30f4f610bf
This commit introduce multiple improvements regarding social image:
- (perf) Don't read ir.attachment through `social_default_image` when it is
not needed. Use a stored boolean to know if the field should be accessed.
This will remove one SQL query in attachment for public user.
- Show website logo, not the company logo since we now have a different logo
for website.
- Don't show images lower than 200 width or 200 height px. Logo will be
shown regardless of his size.
- Don't show website logo if there is a website social_default_image.
Indeed, the spec was to prevent showing logo and social_default_image if
they are the same image. Technically, this is hard to identify as they
could be the same image uploaded with different resolutions (media dialog),
especially if one of those was uploaded through the backend and one from
the frontend.
It is most likely we will never correctly identify duplicate as they won't
be exactly the same.
For this reason, it makes more sense to hide the website logo if the
social_default_image is set. It avoids every issues while it makes sense
since you won't want to use the logo over the social_default_image. If you
really want to, you could reupload it through the SEO media dialog.
closes odoo/odoo#47848
Related: odoo/upgrade#1012
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Co-authored-by: Romain Derie <rde@odoo.com>
Co-authored-by: Jeremy Kersten <jke@odoo.com>
123 lines
4.6 KiB
Python
123 lines
4.6 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo.tests.common import HttpCase
|
|
|
|
EXTRA_REQUEST = 5
|
|
""" During tests, the query on 'base_registry_signaling, base_cache_signaling'
|
|
won't be executed on hot state, but 6 new queries related to the test cursor
|
|
will be added:
|
|
SAVEPOINT "test_cursor_4"
|
|
SAVEPOINT "test_cursor_4"
|
|
ROLLBACK TO SAVEPOINT "test_cursor_4"
|
|
SAVEPOINT "test_cursor_5"
|
|
[.. usual SQL Queries .. ]
|
|
SAVEPOINT "test_cursor_5"
|
|
ROLLBACK TO SAVEPOINT "test_cursor_5"
|
|
"""
|
|
|
|
|
|
class UtilPerf(HttpCase):
|
|
def _get_url_hot_query(self, url):
|
|
# ensure worker is in hot state
|
|
self.url_open(url)
|
|
self.url_open(url)
|
|
|
|
sql_count = self.registry.test_cr.sql_log_count
|
|
self.url_open(url)
|
|
return self.registry.test_cr.sql_log_count - sql_count - EXTRA_REQUEST
|
|
|
|
|
|
class TestStandardPerformance(UtilPerf):
|
|
def test_10_perf_sql_img_controller(self):
|
|
self.authenticate('demo', 'demo')
|
|
url = '/web/image/res.country/4/image'
|
|
self.assertEqual(self._get_url_hot_query(url), 4)
|
|
url = '/web/image/res.users/2/image_256'
|
|
self.assertEqual(self._get_url_hot_query(url), 7)
|
|
|
|
def test_20_perf_sql_img_controller_bis(self):
|
|
url = '/web/image/website/1/favicon'
|
|
self.assertEqual(self._get_url_hot_query(url), 4)
|
|
self.authenticate('portal', 'portal')
|
|
self.assertEqual(self._get_url_hot_query(url), 4)
|
|
|
|
|
|
class TestWebsitePerformance(UtilPerf):
|
|
|
|
def setUp(self):
|
|
super().setUp()
|
|
self.page, self.menu = self._create_page_with_menu('/sql_page')
|
|
|
|
def _create_page_with_menu(self, url):
|
|
name = url[1:]
|
|
website = self.env['website'].browse(1)
|
|
page = self.env['website.page'].create({
|
|
'url': url,
|
|
'name': name,
|
|
'type': 'qweb',
|
|
'arch': '<t name="%s" t-name="website.page_test_%s"> \
|
|
<t t-call="website.layout"> \
|
|
<div id="wrap"><div class="oe_structure"/></div> \
|
|
</t> \
|
|
</t>' % (name, name),
|
|
'key': 'website.page_test_%s' % name,
|
|
'is_published': True,
|
|
'website_id': website.id,
|
|
'track': False,
|
|
})
|
|
menu = self.env['website.menu'].create({
|
|
'name': name,
|
|
'url': url,
|
|
'page_id': page.id,
|
|
'website_id': website.id,
|
|
'parent_id': website.menu_id.id
|
|
})
|
|
return (page, menu)
|
|
|
|
def test_10_perf_sql_queries_page(self):
|
|
# standard untracked website.page
|
|
self.assertEqual(self._get_url_hot_query(self.page.url), 11)
|
|
self.menu.unlink()
|
|
self.assertEqual(self._get_url_hot_query(self.page.url), 13)
|
|
|
|
def test_15_perf_sql_queries_page(self):
|
|
# standard tracked website.page
|
|
self.page.track = True
|
|
self.assertEqual(self._get_url_hot_query(self.page.url), 19)
|
|
self.menu.unlink()
|
|
self.assertEqual(self._get_url_hot_query(self.page.url), 21)
|
|
|
|
def test_20_perf_sql_queries_homepage(self):
|
|
# homepage "/" has its own controller
|
|
self.assertEqual(self._get_url_hot_query('/'), 18)
|
|
|
|
def test_30_perf_sql_queries_page_no_layout(self):
|
|
# website.page with no call to layout templates
|
|
self.page.arch = '<div>I am a blank page</div>'
|
|
self.assertEqual(self._get_url_hot_query(self.page.url), 9)
|
|
|
|
def test_40_perf_sql_queries_page_multi_level_menu(self):
|
|
# menu structure should not impact SQL requests
|
|
_, menu_a = self._create_page_with_menu('/a')
|
|
_, menu_aa = self._create_page_with_menu('/aa')
|
|
_, menu_b = self._create_page_with_menu('/b')
|
|
_, menu_bb = self._create_page_with_menu('/bb')
|
|
_, menu_bbb = self._create_page_with_menu('/bbb')
|
|
_, menu_bbbb = self._create_page_with_menu('/bbbb')
|
|
_, menu_bbbbb = self._create_page_with_menu('/bbbbb')
|
|
self._create_page_with_menu('c')
|
|
menu_bbbbb.parent_id = menu_bbbb
|
|
menu_bbbb.parent_id = menu_bbb
|
|
menu_bbb.parent_id = menu_bb
|
|
menu_bb.parent_id = menu_b
|
|
menu_aa.parent_id = menu_a
|
|
|
|
self.assertEqual(self._get_url_hot_query(self.page.url), 11)
|
|
|
|
def test_50_perf_sql_web_content(self):
|
|
# assets route /web/content/..
|
|
self.url_open('/') # create assets attachments
|
|
assets_url = self.env['ir.attachment'].search([('url', '=like', '/web/content/%/web.assets_common%.js')], limit=1).url
|
|
self.assertEqual(self._get_url_hot_query(assets_url), 2)
|