[Erp5-report] r27620 - in /erp5/trunk/products/CMFActivity: ./ dtml/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jun 16 18:18:08 CEST 2009
Author: jm
Date: Tue Jun 16 18:18:08 2009
New Revision: 27620
URL: http://svn.erp5.org?rev=27620&view=rev
Log:
Restore links to cancel or invoke activities manually from "Activities" tab, and add a button in "Advanced" tab to be able to hide them.
Modified:
erp5/trunk/products/CMFActivity/ActivityTool.py
erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml
erp5/trunk/products/CMFActivity/dtml/manageActivitiesAdvanced.dtml
Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=27620&r1=27619&r2=27620&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] Tue Jun 16 18:18:08 2009
@@ -506,6 +506,7 @@
activity_creation_trace = False
activity_tracking = False
activity_timing_log = False
+ cancel_and_invoke_links_hidden = False
def SQLDict_setPriority(self, **kw):
real_SQLDict_setPriority = getattr(self.aq_parent, 'SQLDict_setPriority')
@@ -653,6 +654,30 @@
if RESPONSE is not None:
url = '%s/manageActivitiesAdvanced?manage_tabs_message=' % self.absolute_url()
url += urllib.quote('Activity creation trace disabled')
+ RESPONSE.redirect(url)
+
+ security.declareProtected(Permissions.manage_properties, 'isCancelAndInvokeLinksHidden')
+ def isCancelAndInvokeLinksHidden(self):
+ return self.cancel_and_invoke_links_hidden
+
+ security.declareProtected(Permissions.manage_properties, 'manage_hideCancelAndInvokeLinks')
+ def manage_hideCancelAndInvokeLinks(self, REQUEST=None, RESPONSE=None):
+ """
+ """
+ self.cancel_and_invoke_links_hidden = True
+ if RESPONSE is not None:
+ url = '%s/manageActivitiesAdvanced?manage_tabs_message=' % self.absolute_url()
+ url += urllib.quote('Cancel and invoke links hidden')
+ RESPONSE.redirect(url)
+
+ security.declareProtected(Permissions.manage_properties, 'manage_showCancelAndInvokeLinks')
+ def manage_showCancelAndInvokeLinks(self, REQUEST=None, RESPONSE=None):
+ """
+ """
+ self.cancel_and_invoke_links_hidden = False
+ if RESPONSE is not None:
+ url = '%s/manageActivitiesAdvanced?manage_tabs_message=' % self.absolute_url()
+ url += urllib.quote('Cancel and invoke links visible')
RESPONSE.redirect(url)
def manage_beforeDelete(self, item, container):
Modified: erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml?rev=27620&r1=27619&r2=27620&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml [utf8] (original)
+++ erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml [utf8] Tue Jun 16 18:18:08 2009
@@ -30,8 +30,18 @@
<dtml-var manage_tabs>
<h3>Queued Activities</h3>
+
+<dtml-let show_cancel_and_invoke_links="not isCancelAndInvokeLinksHidden()">
+<dtml-if show_cancel_and_invoke_links>
+ <p>Warning: Invoking or canceling activities will invoke/cancel all activities with both the same path and the same method_id.</p>
+ <p>Warning: Invoking an activity will <b>not</b> run any dependency check.</p>
+</dtml-if>
+
<table cellspacing="0" cellpadding="2" border="1">
<tr>
+ <dtml-if show_cancel_and_invoke_links>
+ <th align="left" valign="top"></th>
+ </dtml-if>
<th align="left" valign="top">Uid</th>
<th align="left" valign="top">Object</th>
<th align="left" valign="top">Method Id</th>
@@ -44,9 +54,16 @@
<th align="left" valign="top">Call traceback</th>
</tr>
<dtml-in expr="getMessageList(include_processing=1)">
+ <dtml-let path="'/'.join(object_path)">
<tr>
+ <dtml-if show_cancel_and_invoke_links>
+ <td align="left" valign="top">
+ <a href="manageCancel?object_path=&dtml-path;&method_id=&dtml-method_id;">Cancel</a>
+ <a href="manageInvoke?object_path=&dtml-path;&method_id=&dtml-method_id;">Invoke</a>
+ </td>
+ </dtml-if>
<td align="left" valign="top"><dtml-var uid></td>
- <td align="left" valign="top"><a href="<dtml-var "'/'.join(object_path)">"><dtml-var "'/'.join(object_path)"></a></td>
+ <td align="left" valign="top"><a href="&dtml-path;"><dtml-var path></a></td>
<td align="left" valign="top"><dtml-var method_id></td>
<td align="left" valign="top">
<dtml-if activity_kw><dtml-var expr="_.repr(activity_kw)[1:-1]" html_quote>
@@ -76,8 +93,9 @@
</dtml-if>
</td>
</tr>
+ </dtml-let>
</dtml-in>
</table>
-
+</dtml-let>
<dtml-var manage_page_footer>
Modified: erp5/trunk/products/CMFActivity/dtml/manageActivitiesAdvanced.dtml
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/dtml/manageActivitiesAdvanced.dtml?rev=27620&r1=27619&r2=27620&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/dtml/manageActivitiesAdvanced.dtml [utf8] (original)
+++ erp5/trunk/products/CMFActivity/dtml/manageActivitiesAdvanced.dtml [utf8] Tue Jun 16 18:18:08 2009
@@ -2,7 +2,7 @@
<dtml-var manage_tabs>
<br />
-<form action="<dtml-var URL1>">
+<form action="&dtml-URL1;">
<table width="100%" cellspacing="0" cellpadding="2" border="0">
<tr class="section-bar">
<td colspan="3" align="left">
@@ -60,7 +60,7 @@
</dtml-if>
</td>
<td>
- <p class="form-help">Controls wether activities should contain a stack trace from their creation.
+ <p class="form-help">Controls whether activities should contain a stack trace from their creation.
It helps finding out where an activity comes from.
Those traces are logged and mailed when an activity fails (as part of regular activity failure mails).</p>
</td>
@@ -80,23 +80,37 @@
<p class="form-help">Recreate activity tables, preserving existing messages.</p>
</td>
<td align="right" valign="top">
-<form action="<dtml-var URL1>">
+<form action="&dtml-URL1;">
<input class="form-element" type="submit"
name="manageClearActivities:method" value=" Recreate Tables ">
</form>
</td>
</tr>
<tr>
- <td>
+ <td align="left" valign="top">
<p class="form-help">Recreate activity tables, throwing away all contained messages.</p>
</td>
<td align="right" valign="top">
- <form action="<dtml-var URL1>">
+ <form action="&dtml-URL1;">
<input type="hidden" name="keep:int" value="0">
<input class="form-element" type="submit"
name="manageClearActivities:method" value=" Clear Activities " style="background-color: #F00">
</form>
-
+ </td>
+</tr>
+<tr>
+ <td align="left" valign="top">
+ <p class="form-help">Controls the visibility of links to cancel or invoke activities from "Activities" tab.
+ These links are too dangerous in production environment and they must not be visible.</p>
+ </td>
+ <td align="right" valign="top">
+ <form action="&dtml-URL1;">
+ <dtml-if isCancelAndInvokeLinksHidden>
+ <input class="form-element" type="submit" name="manage_showCancelAndInvokeLinks:method" value="Show Links" style="background-color: #F00">
+ <dtml-else>
+ <input class="form-element" type="submit" name="manage_hideCancelAndInvokeLinks:method" value="Hide Links">
+ </dtml-if>
+ </form>
</td>
</tr>
</table>
More information about the Erp5-report
mailing list