diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-21 18:20:22 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-21 18:20:22 +0100 |
| commit | e8f630e44df6460a9027cc07fd79d2a4e11ce17c (patch) | |
| tree | 5462ac8d67c48fa524f7d4093371bcc565f538e5 /addons/website/views | |
| parent | 3c468b0185077626ef2d2f220294f24923dd504f (diff) | |
| parent | 7a45296cf1a1643de6b2a114e535bc167364498e (diff) | |
[MERGE] forward port branch saas-15 up to 7a45296cf1a
Diffstat (limited to 'addons/website/views')
| -rw-r--r-- | addons/website/views/website_templates.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 69afcbbbd94..16fc3e33444 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -124,8 +124,8 @@ and main_object.website_meta_description or website_meta_description"/> <t t-set="meta_keywords" t-value="main_object and 'website_meta_keywords' in main_object and main_object.website_meta_keywords or website_meta_keywords"/> - <meta t-if="meta_description" name="description" t-att-content="meta_description"/> - <meta t-if="meta_keywords" name="keywords" t-att-content="meta_keywords"/> + <meta t-if="meta_description or editable" name="description" t-att-content="meta_description"/> + <meta t-if="meta_keywords or editable" name="keywords" t-att-content="meta_keywords"/> <!-- OpenGraph tags for Facebook sharing --> <meta property="og:title" t-att-content="additional_title" /> |