summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtul Patel (OpenERP) <atp@tinyerp.com>2012-09-26 23:26:59 +0530
committerAtul Patel (OpenERP) <atp@tinyerp.com>2012-09-26 23:26:59 +0530
commit97fdf97be2e26cb7f1ff973a6ca9222e749762fd (patch)
treeec47fe34329bf0a353db0c7648e84f8f445f9aea
parentfeec62da0b550c2f3c8a181cc5166c4c036fc2c6 (diff)
[FIX]: Add help instead of follow_help key
bzr revid: atp@tinyerp.com-20120926175659-7x7r0zpek55jqaeq
-rw-r--r--addons/crm/crm_view.xml2
-rw-r--r--addons/mail/static/src/js/mail_followers.js1
-rw-r--r--addons/mail/static/src/xml/mail_followers.xml4
-rw-r--r--addons/project/project_view.xml2
4 files changed, 5 insertions, 4 deletions
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 63f709f1290..3af7426a957 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -117,7 +117,7 @@
</notebook>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
- <field name="message_follower_ids" widget="mail_followers" context="{'followers_help': 'The User will automatically follow record created under this Sales team'}"/>
+ <field name="message_follower_ids" widget="mail_followers" help="The User will automatically follow record created under this Sales team"/>
</div>
</form>
</field>
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 3527313a72c..b9d515fddc8 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -28,6 +28,7 @@ openerp_mail_followers = function(session, mail) {
this.options.image = this.node.attrs.image || 'image_small';
this.options.title = this.node.attrs.title || 'Followers';
this.options.context = this.node.attrs.context;
+ this.options.comment = this.node.attrs.help || false;
this.ds_model = new session.web.DataSetSearch(this, this.view.model);
this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
},
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index e8a6a2aa910..cf31ab3e24c 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -12,8 +12,8 @@
<button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
</div>
<div class="oe_grey">
- <t t-if='widget.options.context'>
- <h5><t t-raw="widget.options.context['followers_help']"/></h5>
+ <t t-if="widget.options.comment">
+ <h5><t t-raw="widget.options.comment"/></h5>
</t>
</div>
<div class="oe_mail_recthread_followers">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 462f622fa03..45ba2f3cc38 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -153,7 +153,7 @@
</sheet>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
- <field name="message_follower_ids" widget="mail_followers" context="{'followers_help': 'The User will automatically follow record created under this project'}"/>
+ <field name="message_follower_ids" widget="mail_followers" help ="The User will automatically follow record created under this project"/>
</div>
</form>
</field>