pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] replace instances of t[@t-field], they're a pain in the ass

Browse Source 
bzr revid: xmo@openerp.com-20130925112803-ya54yb2kwdodj3y5
This commit is contained in:
Xavier Morel
2013-09-25 13:28:03 +02:00
parent 71a1b12e31
commit aae0a815d2
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/views/views.xml
+1 -1
View File
@@ -77,7 +77,7 @@
<ul class="nav navbar-nav navbar-right" id="top_menu">
<li name="contactus"><a href="/page/website.contactus">Contact us</a></li>
<li t-if="user_id.id == website.public_user.id"><a href="/admin">Sign in</a></li>
<li t-if="user_id.id != website.public_user.id"><a href="/admin"><t t-field="user_id.name"/></a></li>
<li t-if="user_id.id != website.public_user.id"><a href="/admin"><span t-field="user_id.name"/></a></li>
<li t-if="len(website.language_ids) &gt; 1" class="dropdown">
<!-- TODO: use flags for language selection -->
<t t-set="lang_selected" t-value="[lg for lg in website.language_ids if lg.code == lang]"/>
addons/website_blog/views/website_blog_templates.xml
+6 -6
View File
@@ -19,8 +19,8 @@
<a t-attf-href="/blog/#{blog_post.category_id.id}/#{blog_post.id}#comment" t-field="blog_post.name"></a>
</h2>
<p class="post-meta text-muted text-center">
<span class="icon-calendar"> <t t-field="blog_post.create_date"/></span> &amp;nbsp;
<span class="icon-user"> By <t t-field="blog_post.create_uid"/></span> &amp;nbsp;
<span class="icon-calendar"> <span t-field="blog_post.create_date"/></span> &amp;nbsp;
<span class="icon-user"> By <span t-field="blog_post.create_uid"/></span> &amp;nbsp;
<span t-if="len(blog_post.message_ids) &gt; 0" class="icon-comment"> With
<a t-if="len(blog_post.message_ids) &lt;= 1" t-attf-href="/blog/#{blog_post.category_id.id}/#{blog_post.id}#comments"><t t-esc="len(blog_post.message_ids)"/> comment</a>
<a t-if="len(blog_post.message_ids) > 1" t-attf-href="/blog/#{blog_post.category_id.id}/#{blog_post.id}#comments"><t t-esc="len(blog_post.message_ids)"/> comments</a>
@@ -41,8 +41,8 @@
<h2 class="text-center" t-field="blog_post.name"/>
<p class="post-meta text-muted text-center">
<span class="icon-calendar"> <t t-field="blog_post.create_date"/></span> &amp;nbsp;
<span class="icon-user"> By <t t-field="blog_post.create_uid"/></span> &amp;nbsp;
<span class="icon-calendar"> <span t-field="blog_post.create_date"/></span> &amp;nbsp;
<span class="icon-user"> By <span t-field="blog_post.create_uid"/></span> &amp;nbsp;
<span t-if="len(blog_post.message_ids) &gt; 0" class="icon-comment"> With
<a t-if="len(blog_post.message_ids) &lt;= 1" t-attf-href="#comments"><t t-esc="len(blog_post.message_ids)"/> comment</a>
<a t-if="len(blog_post.message_ids) > 1" t-attf-href="#comments"><t t-esc="len(blog_post.message_ids)"/> comments</a>
@@ -83,7 +83,7 @@
<t t-call="website.publish_management"><t t-set="object" t-value="message"/></t>
<t t-raw="message.body"/>
<small class="pull-left text-muted text-left">
<t t-field="message.author_id"/> on <t t-field="message.date"/>
<span t-field="message.author_id"/> on <span t-field="message.date"/>
</small>
</div>
</li>
@@ -180,7 +180,7 @@
<t t-foreach="categories" t-as="nav_category">
<li t-att-class="'active' if category and category.id == nav_category.id else ''">
<a t-attf-href="/blog/#{nav_category.id}">
<t t-field="nav_category.name"/>
<span t-field="nav_category.name"/>
</a>
</li>
</t>
addons/website_event/views/website_event.xml
+1 -1
View File
@@ -180,7 +180,7 @@
<td><span t-field="ticket.name"/></td>
<td><span t-field="ticket.deadline"/></td>
<td><span t-field="ticket.price"/></td>
<td><span t-if="ticket.register_max"><t t-esc="ticket.register_current"/>/<t t-field="ticket.register_max"/></span></td>
<td><span t-if="ticket.register_max"><t t-esc="ticket.register_current"/>/<span t-field="ticket.register_max"/></span></td>
<td>
<select t-if="ticket.register_avail" t-attf-name="ticket-#{ ticket.id }" class="form-control">
<t t-foreach="range(0, ticket.register_avail > 9 and 10 or ticket.register_avail+1 )" t-as="nb"><option t-esc="nb"/></t>
addons/website_sale/views/website_sale.xml
+4 -4
View File
@@ -184,7 +184,7 @@
<template id="product_description" inherit_option_id="website_sale.products" name="Product Description">
<xpath expr="//div[@id='product_description']" position="replace">
<small>
<t t-field="product.description_sale"/>
<span t-field="product.description_sale"/>
</small>
</xpath>
</template>
@@ -230,7 +230,7 @@
<div class="col-sm-5">
<ol class="breadcrumb">
<li><a href="/shop">Products</a></li>
<li t-if="category"><a t-att-href="'/shop/category/%s' % (category_id,)"><t t-field="category.name"/></a></li>
<li t-if="category"><a t-att-href="'/shop/category/%s' % (category_id,)"><span t-field="category.name"/></a></li>
<li class="active" t-field="product.name">Product Name</li>
</ol>
</div><div class="col-sm-3">
@@ -284,11 +284,11 @@
</t>
<div>
<t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
<h5 class="text-error" style="text-decoration: line-through;" title="Price without reduction"><t t-field="product.product_variant_ids[0].lst_price" /> €</h5>
<h5 class="text-error" style="text-decoration: line-through;" title="Price without reduction"><span t-field="product.product_variant_ids[0].lst_price" /> €</h5>
<h4><t t-esc="product.product_variant_ids[0].price" /> €</h4>
</t>
<h4 t-if="product.product_variant_ids[0].lst_price == product.product_variant_ids[0].price">
<b><t t-field="product.product_variant_ids[0].lst_price" /> €</b>
<b><span t-field="product.product_variant_ids[0].lst_price" /> €</b>
</h4>
</div>
<button class="btn btn-primary btn-lg mt8">Add to Cart</button>