diff options
| author | Raphael Collet <rco@openerp.com> | 2016-08-12 09:36:25 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2016-08-16 09:55:46 +0200 |
| commit | ffdafd3f8a6a18f2af9d5aa7f2446c299cb71967 (patch) | |
| tree | de82f81db7be5b64f9f4226aea31048f2089bf74 /addons/website_mail | |
| parent | 856f2e87e645db697a67fc85caae07bf0fe11d3f (diff) | |
[REM] most uses of `_model` (useless in most cases)
Diffstat (limited to 'addons/website_mail')
| -rw-r--r-- | addons/website_mail/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_mail/views/website_mail_templates.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py index ca7678a458e..c966b2bede7 100644 --- a/addons/website_mail/controllers/main.py +++ b/addons/website_mail/controllers/main.py @@ -16,7 +16,7 @@ def object_shasign(record=False, res_model='', res_id=None, **kw): shasign = False timestamp = int(time()) if record: - shasign = sha1('%s%s%s%s' % (record._model, record.id, secret, timestamp)).hexdigest() + shasign = sha1('%s%s%s%s' % (record._name, record.id, secret, timestamp)).hexdigest() elif res_model and res_id: shasign = sha1('%s%s%s%s' % (res_model, res_id, secret, timestamp)).hexdigest() return (shasign, timestamp) diff --git a/addons/website_mail/views/website_mail_templates.xml b/addons/website_mail/views/website_mail_templates.xml index b65a19b3271..cf250cc18b2 100644 --- a/addons/website_mail/views/website_mail_templates.xml +++ b/addons/website_mail/views/website_mail_templates.xml @@ -48,7 +48,7 @@ <img class="img pull-left img-circle" t-attf-src="/web/image/res.partner/#{user_id.partner_id.id}/image_small/50x50" style="width: 50px; margin-right: 10px;"/> <div class="pull-left mb32" style="width: 75%%"> <textarea rows="4" name="message" class="form-control" placeholder="Write a message..."></textarea> - <input type='hidden' name="res_model" t-att-value="object._model"/> + <input type='hidden' name="res_model" t-att-value="object._name"/> <input type='hidden' name="res_id" t-att-value="object.id"/> <input type='hidden' name="token" t-att-value="token" t-if="token"/> <input type='hidden' name="sha_in" t-att-value="sha_in" t-if="sha_in"/> |