[FIX] web, base_setup: template didn't exist because of deps

An enterprise without apps would crash on launch because of a template
web_enterprise would inherit but was only there with base_setup
installed.

closes odoo/odoo#97017

Related: odoo/enterprise#29919
Signed-off-by: Simon Genin (ges@odoo) <ges@odoo.com>
This commit is contained in:
Simon Genin (ges)
2022-07-28 21:01:50 +02:00
parent 528ee16956
commit df2562e4f0
10 changed files with 6 additions and 11 deletions
-9
View File
@@ -19,14 +19,5 @@ Shows you a list of applications features to install from.
],
'installable': True,
'assets': {
'web.assets_backend': [
'base_setup/static/src/scss/settings.scss',
'base_setup/static/src/js/**/*.js',
],
'web.assets_qweb': [
'base_setup/static/src/xml/**/*',
],
},
'license': 'LGPL-3',
}
@@ -30,7 +30,7 @@ class ResConfigInviteUsers extends Component {
* @returns {boolean} true if the given email address is valid
*/
validateEmail(email) {
const re = /^([a-z0-9][-a-z0-9_\+\.]*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,63}(?:\.[a-z]{2})?)$/i;
const re = /^([a-z0-9][-a-z0-9_+.]*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,63}(?:\.[a-z]{2})?)$/i;
return re.test(email);
}
@@ -54,7 +54,11 @@ class ResConfigInviteUsers extends Component {
}
}
if (invalidEmails.length) {
throw new Error(`${_t("Invalid email address")}${ invalidEmails.length > 1 ? "es" : "" }: ${invalidEmails.join(", ")}`);
throw new Error(
`${_t("Invalid email address")}${
invalidEmails.length > 1 ? "es" : ""
}: ${invalidEmails.join(", ")}`
);
}
}