Merge lp:~openerp-dev/openobject-addons/trunk-signature-jsh into lp:openobject-addons

[Jaysinh Shukla(OpenERP)]

Modified 'mail' module to accept HTML tags as signature. The change is because of modification in 'signature' field of 'res.users'. Previously it was 'text' now 'html'. Modified test condition in which text of body is striped downed and compared to striped downed signature. For detaild explaination of test case kindly observe the following example.

Previous test case ('signature' is 'text') :
  Is 'By Admin' In html2plaintext('Mail body' + ' By Admin') ? <- No broke.

Now After change in signature field ('signature' is 'html) :
  Is '<b>By Admin</b>' In html2plaintext('Mail body' + ' <b>By Admin</b>') ? <- Broke the condition. Because html2plaintext will remove the '<b>' tag.

To not break the test condition after changing 'signature' field observ following example :
  Is html2plaintext('<b>By Admin</b>') In ('Mail body' + ' <b>By Admin</b>') ? <- YES !

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

You should grep signature and all addons and see if your change has an impact.

Notably, I would like you to check the following things :
- account_followup/report/account_followup_print.py: uses user signature -> how does it behave with html tags and things like that ?
- hr_evaluation/hr_evaluation.py: user signature seems to be used, so same question
- crm_partner_assign/crm_partner_assign_data.xml: user signature is used in a pre, it wlil give some strange result

Best regards,

review: Needs Fixing (technical)

[lp:~openerp-dev/openobject-addons/trunk-signature-jsh]

9336. By Amit Vora(OpenERP) on 2014-04-21

[MRG] merge with main branch

9337. By Amit Vora(OpenERP) on 2014-04-22

[IMP] use safe for signature field

9338. By Amit Vora(OpenERP) on 2014-04-25

[MRG] merge with main branch

9339. By Amit Vora(OpenERP) on 2014-04-25

[IMP] improve code

9340. By Mehul Mehta(OpenERP) on 2014-05-01

[Merge] Merged with lp:openobject-addons

9341. By Mehul Mehta(OpenERP) on 2014-05-01

[IMP] improved a signature in portal_demo file

9342. By Mehul Mehta(OpenERP) on 2014-05-01

minor changes apply

9343. By Sunil Sharma(OpenERP) on 2014-05-02

[mrg]:lp:openobject-addons

9344. By Amit Vora(OpenERP) on 2014-05-16

[MRG] merge with main branch

Unmerged revisions

9344. By Amit Vora(OpenERP) on 2014-05-16

[MRG] merge with main branch

9343. By Sunil Sharma(OpenERP) on 2014-05-02

[mrg]:lp:openobject-addons

9342. By Mehul Mehta(OpenERP) on 2014-05-01

minor changes apply

9341. By Mehul Mehta(OpenERP) on 2014-05-01

[IMP] improved a signature in portal_demo file

9340. By Mehul Mehta(OpenERP) on 2014-05-01

[Merge] Merged with lp:openobject-addons

9339. By Amit Vora(OpenERP) on 2014-04-25

[IMP] improve code

9338. By Amit Vora(OpenERP) on 2014-04-25

[MRG] merge with main branch

9337. By Amit Vora(OpenERP) on 2014-04-22

[IMP] use safe for signature field

9336. By Amit Vora(OpenERP) on 2014-04-21

[MRG] merge with main branch

9335. By Jaysinh Shukla(OpenERP) on 2014-04-15

[IMP]:mail Unnecessary comments removed. Improved mail test case.

=== modified file 'crm_partner_assign/crm_partner_assign_data.xml'
--- crm_partner_assign/crm_partner_assign_data.xml	2013-11-22 19:44:15 +0000
+++ crm_partner_assign/crm_partner_assign_data.xml	2014-05-16 09:33:42 +0000
@@ -48,7 +48,7 @@
 <p>Thanks,</p>
 
 <pre>
-${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or ''}
+${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature | safe or ''}
 </pre>
 % if not ctx['partner_id'].user_id:
 PS: It looks like you do not have an account manager assigned to you, please contact us.

=== modified file 'hr_recruitment/hr_recruitment_data.xml'
--- hr_recruitment/hr_recruitment_data.xml	2014-02-12 09:56:06 +0000
+++ hr_recruitment/hr_recruitment_data.xml	2014-05-16 09:33:42 +0000
@@ -33,7 +33,7 @@
         <p>If you want more details, feel free to contact us by phone.</p>
         <p>Kind regards,</p>
         <br/>
-         ${object.user_id and object.user_id.signature or ''}]]></field>
+         ${object.user_id and object.user_id.signature | safe or ''}]]></field>
     </record>
 
     <record id="applicant_interest" model="email.template">
@@ -51,7 +51,7 @@
         If I do not answer, please let me a message with some schedules to call you back.</p>
         <p>Kind regards,</p>
         <br/>
-         ${object.user_id.signature}]]></field>
+         ${object.user_id.signature | safe}]]></field>
     </record>
 
         <!--    HR Recruitment Source        -->

=== modified file 'mail/mail_followers.py'
--- mail/mail_followers.py	2014-04-23 12:53:19 +0000
+++ mail/mail_followers.py	2014-05-16 09:33:42 +0000
@@ -119,11 +119,10 @@
         # add user signature
         user = self.pool.get("res.users").browse(cr, SUPERUSER_ID, [user_id], context=context)[0]
         if user.signature:
-            signature = plaintext2html(user.signature)
+            signature = user.signature
         else:
             signature = "--<br />%s" % user.name
-        footer = tools.append_content_to_html(footer, signature, plaintext=False, container_tag='p')
-
+        footer = tools.append_content_to_html(footer, signature, plaintext=False)
         # add company signature
         if user.company_id.website:
             website_url = ('http://%s' % user.company_id.website) if not user.company_id.website.lower().startswith(('http:', 'https:')) \

=== modified file 'mail/tests/test_mail_features.py'
--- mail/tests/test_mail_features.py	2014-04-17 09:41:33 +0000
+++ mail/tests/test_mail_features.py	2014-05-16 09:33:42 +0000
@@ -22,10 +22,9 @@
 from openerp.addons.mail.mail_mail import mail_mail
 from openerp.addons.mail.mail_thread import mail_thread
 from openerp.addons.mail.tests.common import TestMail
-from openerp.tools import mute_logger, email_split
+from openerp.tools import mute_logger, email_split, html2plaintext
 from openerp.tools.mail import html_sanitize
 
-
 class test_mail(TestMail):
 
     def test_000_alias_setup(self):
@@ -474,7 +473,7 @@
                             'message_post: notification email body alternative should contain the body')
             self.assertNotIn('<p>', sent_email['body_alternative'],
                             'message_post: notification email body alternative still contains html')
-            self.assertIn(user_raoul.signature, sent_email['body_alternative'],
+            self.assertIn(html2plaintext(user_raoul.signature), sent_email['body_alternative'],
                             'message_post: notification email body alternative should contain the sender signature')
             self.assertFalse(sent_email['references'],
                             'message_post: references should be False when sending a message that is not a reply')
@@ -545,7 +544,7 @@
                             'message_post: notification email body alternative should contain the body')
             self.assertNotIn('<p>', sent_email['body_alternative'],
                             'message_post: notification email body alternative still contains html')
-            self.assertIn(user_raoul.signature, sent_email['body_alternative'],
+            self.assertIn(html2plaintext(user_raoul.signature), sent_email['body_alternative'],
                             'message_post: notification email body alternative should contain the sender signature')
             self.assertIn(msg_message_id, sent_email['references'],
                             'message_post: notification email references lacks parent message message_id')

=== modified file 'portal/portal_demo.xml'
--- portal/portal_demo.xml	2014-04-09 10:16:04 +0000
+++ portal/portal_demo.xml	2014-05-16 09:33:42 +0000
@@ -18,8 +18,8 @@
             <field name="partner_id" ref="partner_demo_portal"/>
             <field name="login">portal</field>
             <field name="password">portal</field>
-            <field name="signature">--
-Mr Demo Portal</field>
+            <field name="signature"><![CDATA[<span>--<br/>
+Mr Demo Portal</span>]]></field>
             <!-- Avoid auto-including this user in any default group -->
             <field name="groups_id" eval="[(5,)]"/>
         </record>