Merge lp:~openerp-dev/openobject-addons/trunk-edit-subtype-fix-kch into lp:openobject-addons

[Kunal Chavda]

Fixed issue like, while we clicked on subtype label from edit subtype dialog box it should be checked same subtype.
But currently it checked subtype of parent window.
I have passed dialog value to xml and on the basis of dialog value it add some value in t-att-id of record. so it will be identified by that id to check wheather it is from dialog box or parent window.

Thanks,
Kunal Chavda.

[lp:~openerp-dev/openobject-addons/trunk-edit-subtype-fix-kch]

8831. By Kunal Chavda on 2013-07-24

[REM]remove unwanted diff line.

8832. By Vidhin Mehta (OpenERP) on 2013-07-24

[fix]

Unmerged revisions

8832. By Vidhin Mehta (OpenERP) on 2013-07-24

[fix]

8831. By Kunal Chavda on 2013-07-24

[REM]remove unwanted diff line.

8830. By Kunal Chavda on 2013-07-24

[FIX]Fixed while click on label from subtype dialogbox it should checked in dialogbox subtype.

=== modified file 'mail/static/src/js/mail_followers.js'
--- mail/static/src/js/mail_followers.js	2013-07-23 09:55:09 +0000
+++ mail/static/src/js/mail_followers.js	2013-07-24 11:47:26 +0000
@@ -270,7 +270,7 @@
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo($list);
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record,'dialog': dialog})).appendTo($list);
             });
             if (_.size(records) > 1) {
                 $list.show();

=== modified file 'mail/static/src/xml/mail_followers.xml'
--- mail/static/src/xml/mail_followers.xml	2013-07-23 09:55:09 +0000
+++ mail/static/src/xml/mail_followers.xml	2013-07-24 11:47:26 +0000
@@ -42,8 +42,8 @@
     <t t-name="mail.followers.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
-                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id+(dialog ? '_in_dialog': '')" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+record.id+(dialog ? '_in_dialog': '')"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
     </t>