odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[iMP] minor bugfixes 

bzr revid: fp@tinyerp.com-20140413195730-zpzpsmo53fqa4x96
This commit is contained in:
Fabien Pinckaers 2014-04-13 21:57:30 +02:00
parent f908137d76
commit 8d6e2b4a15
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/website_mail/controllers/email_designer.py
View File

@ -16,6 +16,7 @@ class WebsiteEmailDesigner(http.Controller):
tids = tmpl_obj.search(cr, uid, [('model','=',template_model)], context=context)
templates = tmpl_obj.browse(cr, uid, tids, context=context)
print templates
values = {
'object': request.registry[model].browse(cr, uid, res_id, context=context),
'templates': templates,

8
addons/website_mail/views/website_email_designer.xml
View File

@ -8,10 +8,10 @@
<t t-set="head">
<script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script>
</t>
<div id="wrap" class="container">
<div id="email_template" t-att-style="(object.body_html and len(templates&gt;0)) and 'display: none'" class="mb32">
<div id="wrap" class="container" t-ignore="True">
<div id="email_template" t-att-style="(object.body_html and len(templates)&gt;0) and 'display: none'" class="mb32">
<a class="mt16 btn btn-default pull-right"
t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;view_type=form' % (model_name, res_id)">
t-attf-href="/web#return_label=Website&amp;model=#{model}&amp;id=#{res_id}&amp;view_type=form">
Back
</a>
<h1 class="page-header mt16">
@ -35,7 +35,7 @@
</div>
</div><div id="email_designer" t-att-style="not (object.body_html and len(templates)&gt; 0) and 'display: none'" class="mb32">
<a class="mt16 btn btn-primary pull-right"
t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;view_type=form' % (model_name, res_id)">
t-attf-href="/web#return_label=Website&amp;model=#{model}&amp;id=#{res_id}&amp;view_type=form">
Save and Continue
</a>
<h1 class="page-header mt16">