Master mail template lang specific preview axj #19165
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ror-odoo
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
4 times, most recently
from
7607c86
to
964be8d
Compare
atp-odoo
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
from
4f95b8f
to
810afc6
Compare
ror-odoo
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
from
810afc6
to
49a8d3c
Compare
mba-odoo
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
2 times, most recently
from
9db30fe
to
499590a
Compare
dka-odoo
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
6 times, most recently
from
e4e5513
to
3f516f7
Compare
mba-odoo
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
2 times, most recently
from
0cf643f
to
03d7399
Compare
mba-odoo
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
4 times, most recently
from
35d5a7f
to
c822809
Compare
|
LGTM |
tde-banana-odoo
requested changes
May 25, 2018
addons/mail/models/mail_template.py
Outdated
| @@ -361,7 +361,8 @@ def get_email_template(self, res_ids): | |||
| return results | |||
| self.ensure_one() | |||
|
|
|||
| langs = self.render_template(self.lang, self.model, res_ids) | |||
| lang = self.env.context.get('template_preview_lang', self.lang) | |||
| langs = self.render_template(lang, self.model, res_ids) | |||
There was a problem hiding this comment.
Well I don't think it is the correct way of doing it. Previous code was rendering the lang field of the template, which could be a jinja template. Here we want to bypass this process and force a lang. I think it is better to a/ check for context key, then b/ if not found, render the template lang field.
| if 'res_id' in fields and not result.get('res_id'): | ||
| records = self._get_records() | ||
| result['res_id'] = records and records[0][0] or False # select first record as a Default | ||
| if self._context.get('template_id') and 'model_id' in fields and not result.get('model_id'): | ||
| result['model_id'] = self.env['mail.template'].browse(self._context['template_id']).model_id.id | ||
| if template and 'model_id' in fields and not result.get('model_id'): |
There was a problem hiding this comment.
Well while we are at it, add a real template_id field on this model. Let us stop playing with context.
There was a problem hiding this comment.
@tde-banana-odoo , Even we make real template field it's not going to be used anywhere because this template_id is used to get the value of selection field(selection key, value) which is model type method. here: https://github.com/odoo/odoo/blob/master/addons/mail/wizard/email_template_preview.py#L13
and also used to get model_id which is inherited here from mail.template. so it's better to keep context. Thanks
mba-odoo
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
4 times, most recently
from
4d6c6fd
to
f85cb6e
Compare
mart-e
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
from
f85cb6e
to
e1b1662
Compare
Purpose: allow to check email preview in a specific language in order to see the result in a given translation context. Specifications * added preview_lang field to change language of template * set default language from the template by evaluating expression if lang field of template is set, This commit is related to task ID: 30245
tde-banana-odoo
force-pushed
the
master-mail-template-lang_specific_preview-axj
branch
from
e1b1662
to
5439e38
Compare
|
@robodoo r+ |
robodoo
pushed a commit
that referenced
this pull request
Apr 24, 2019
Purpose: allow to check email preview in a specific language in order to see the result in a given translation context. Specifications * added preview_lang field to change language of template * set default language from the template by evaluating expression if lang field of template is set, This commit is related to task ID: 30245 closes #19165 Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
|
Merged, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task : https://www.odoo.com/web?#id=30245&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720
Pad: https://pad.odoo.com/p/r.cd909afd5e2214a1845d437b3bf52d66