diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-19 13:25:05 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-19 13:25:05 +0100 |
| commit | da881b0bd2f8f672cd470f6481542bd96896f410 (patch) | |
| tree | d8e668f0a110ae9b4e6ff71125e1ecd6a7fdc79f | |
| parent | fc55d649d69a4b1084cb7b4acc3c93f461517589 (diff) | |
| parent | 5d086cea9b97cec4fe8d07bf6cb06b3d7ee28af7 (diff) | |
[MERGE] forward port branch 9.0 up to 5d086cea9b9
| -rw-r--r-- | addons/website/views/website_templates.xml | 9 | ||||
| -rw-r--r-- | doc/reference/cmdline.rst | 4 | ||||
| -rw-r--r-- | odoo/service/wsgi_server.py | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 79f8b38a0a1..25f05287c88 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -97,11 +97,14 @@ </t> <t t-set="x_icon" t-value="'/web/image/website/%s/favicon/' % website.id"/> <t t-set="head_website"> - <meta name="description" t-att-content="main_object and 'website_meta_description' in main_object + <meta name="generator" content="Odoo"/> + + <t t-set="meta_description" t-value="main_object and 'website_meta_description' in main_object and main_object.website_meta_description or website_meta_description"/> - <meta name="keywords" t-att-content="main_object and 'website_meta_keywords' in main_object + <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 name="generator" content="Odoo"/> + <meta t-if="meta_description" name="description" t-att-content="meta_description"/> + <meta t-if="meta_keywords" name="keywords" t-att-content="meta_keywords"/> <!-- OpenGraph tags for Facebook sharing --> <meta property="og:title" t-att-content="additional_title" /> diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst index b8881e9a935..6e08973d60e 100644 --- a/doc/reference/cmdline.rst +++ b/doc/reference/cmdline.rst @@ -54,7 +54,7 @@ Running the server Maximum allowed virtual memory per worker. If the limit is exceeded, the worker is killed and recycled at the end of the current request. - Defaults to 640MB. + Defaults to 2048MB. .. option:: --limit-memory-hard <limit> @@ -62,7 +62,7 @@ Running the server immediately killed without waiting for the end of the current request processing. - Defaults to 768MB. + Defaults to 2560MB. .. option:: --limit-time-cpu <limit> diff --git a/odoo/service/wsgi_server.py b/odoo/service/wsgi_server.py index 949d6b9b1fc..5161c8af36b 100644 --- a/odoo/service/wsgi_server.py +++ b/odoo/service/wsgi_server.py @@ -65,7 +65,7 @@ def xmlrpc_return(start_response, service, method, params, string_faultcode=Fals def xmlrpc_handle_exception_int(e): if isinstance(e, odoo.exceptions.UserError): - fault = xmlrpclib.Fault(RPC_FAULT_CODE_WARNING, odoo.tools.ustr(e.value)) + fault = xmlrpclib.Fault(RPC_FAULT_CODE_WARNING, odoo.tools.ustr(e.name)) response = xmlrpclib.dumps(fault, allow_none=False, encoding=None) elif isinstance(e, odoo.exceptions.RedirectWarning): fault = xmlrpclib.Fault(RPC_FAULT_CODE_WARNING, str(e)) |