Commit e195232a authored by Jérome Perrin's avatar Jérome Perrin Committed by Kazuhiko Shiozaki

CMFActivity: use pformat instead of repr in ZMI's Activities tab

This improves readability when activity_kw, args or kw are big.
parent ab92e8d3
...@@ -69,6 +69,7 @@ from Products.MailHost.MailHost import MailHostError ...@@ -69,6 +69,7 @@ from Products.MailHost.MailHost import MailHostError
from zLOG import LOG, INFO, WARNING, ERROR from zLOG import LOG, INFO, WARNING, ERROR
import warnings import warnings
from time import time from time import time
from pprint import pformat
try: try:
from Products.TimerService import getTimerService from Products.TimerService import getTimerService
...@@ -665,7 +666,7 @@ class ActivityTool (BaseTool): ...@@ -665,7 +666,7 @@ class ActivityTool (BaseTool):
] + list(BaseTool.manage_options)) ] + list(BaseTool.manage_options))
security.declareProtected( CMFCorePermissions.ManagePortal , 'manageActivities' ) security.declareProtected( CMFCorePermissions.ManagePortal , 'manageActivities' )
manageActivities = DTMLFile( 'dtml/manageActivities', globals() ) manageActivities = DTMLFile( 'dtml/manageActivities', globals(), pformat=pformat )
security.declareProtected( CMFCorePermissions.ManagePortal , 'manageActivitiesAdvanced' ) security.declareProtected( CMFCorePermissions.ManagePortal , 'manageActivitiesAdvanced' )
manageActivitiesAdvanced = DTMLFile( 'dtml/manageActivitiesAdvanced', globals() ) manageActivitiesAdvanced = DTMLFile( 'dtml/manageActivitiesAdvanced', globals() )
......
...@@ -69,17 +69,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -69,17 +69,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<td><code><a href="<dtml-var expr="REQUEST.physicalPathToURL(path)">"><dtml-var path></a></code></td> <td><code><a href="<dtml-var expr="REQUEST.physicalPathToURL(path)">"><dtml-var path></a></code></td>
<td><code><dtml-var method_id></code></td> <td><code><dtml-var method_id></code></td>
<td> <td>
<dtml-if activity_kw><small><pre><dtml-var expr="_.repr(activity_kw)[1:-1]" html_quote></pre></small> <dtml-if activity_kw><small><pre><dtml-var expr="pformat(activity_kw)" html_quote></pre></small>
<dtml-else>&nbsp; <dtml-else>&nbsp;
</dtml-if> </dtml-if>
</td> </td>
<td> <td>
<dtml-if args><small><pre><dtml-var expr="_.repr(_.list(args))[1:-1]" html_quote></pre></small> <dtml-if args><small><pre><dtml-var expr="pformat(_.list(args))" html_quote></pre></small>
<dtml-else>&nbsp; <dtml-else>&nbsp;
</dtml-if> </dtml-if>
</td> </td>
<td> <td>
<dtml-if kw><small><pre><dtml-var expr="_.repr(kw)[1:-1]" html_quote></pre></small> <dtml-if kw><small><pre><dtml-var expr="pformat(kw)" html_quote></pre></small>
<dtml-else>&nbsp; <dtml-else>&nbsp;
</dtml-if> </dtml-if>
</td> </td>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment