From: <ke...@us...> - 2006-05-26 08:51:34
|
Revision: 3070 Author: kevca Date: 2006-05-26 01:51:25 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/mailmanager/?rev=3070&view=rev Log Message: ----------- Fixes for +- No HTML response for HTML Required (#1472881) +- Selecting No change results in a failure (#1467786) Modified Paths: -------------- MailManager/branches/RELENG_2_1/CHANGES.txt MailManager/branches/RELENG_2_1/Extensions/TicketPluggableBrain.py MailManager/branches/RELENG_2_1/www/ticket_index_html.zpt Modified: MailManager/branches/RELENG_2_1/CHANGES.txt =================================================================== --- MailManager/branches/RELENG_2_1/CHANGES.txt 2006-05-26 08:36:28 UTC (rev 3069) +++ MailManager/branches/RELENG_2_1/CHANGES.txt 2006-05-26 08:51:25 UTC (rev 3070) @@ -26,6 +26,8 @@ - Notify user fails with unicode subjects (#1495112) * BUG FIXES From 2.0.8 to 2.0.9 - Formatting broken on templates for HTML (#1477664) +- No HTML response for HTML Required (#1472881) +- Selecting No change results in a failure (#1467786) * BUG FIXES From 2.0.9 to 2.0.10 * SECURITY - Added in fix for potential security issue Modified: MailManager/branches/RELENG_2_1/Extensions/TicketPluggableBrain.py =================================================================== --- MailManager/branches/RELENG_2_1/Extensions/TicketPluggableBrain.py 2006-05-26 08:36:28 UTC (rev 3069) +++ MailManager/branches/RELENG_2_1/Extensions/TicketPluggableBrain.py 2006-05-26 08:51:25 UTC (rev 3070) @@ -978,7 +978,7 @@ * body_is_html : the format to encode the resulting body in * body : altered to be the content of the given tempalte """ - template_name = REQUEST.get('template_name', None).decode('utf-8') + template_name = REQUEST.get('template_name', '').decode('utf-8') if template_name: Modified: MailManager/branches/RELENG_2_1/www/ticket_index_html.zpt =================================================================== --- MailManager/branches/RELENG_2_1/www/ticket_index_html.zpt 2006-05-26 08:36:28 UTC (rev 3069) +++ MailManager/branches/RELENG_2_1/www/ticket_index_html.zpt 2006-05-26 08:51:25 UTC (rev 3070) @@ -420,9 +420,12 @@ <!-- Body --> <tr> - <td colspan="2"> - <textarea tal:attributes="tabindex tabindex/next" tal:condition="not:body_is_html" name="body" rows="16" cols="65" tal:content="body">Non-HTML template.</textarea> - <span tal:condition="body_is_html" + <td colspan="2" tal:define="html_required here/HTMLRequired"> + <textarea tal:attributes="tabindex tabindex/next" + tal:condition="python:not (body_is_html or html_required)" + name="body" rows="16" cols="65" tal:content="body"> + Non-HTML template.</textarea> + <span tal:condition="python:(body_is_html or html_required)" tal:replace="structure python:here.getEditorForm(data=body)"> An EPOZ text area containing HTML template. </span> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |