[Zope-Checkins] CVS: Products/Transience/dtml - manageTransientObjectContainer.dtml:1.9.16.3

[Chris McDonough]

Update of /cvs-repository/Products/Transience/dtml
In directory cvs.zope.org:/tmp/cvs-serv30889/dtml

Modified Files:
      Tag: Zope-2_7-branch
	manageTransientObjectContainer.dtml 
Log Message:
- Make TransientObjectContainer __setstate__ actually work. ;-)
  Upgrades should be flawless from Zope 2.7.0, 2.7.1, and 2.7.2.
  Upgrades from 2.6.3 will work, but data may not be retained.

- Added a "reset" button to the TOC management page and a reset
  argument to the associated target method.  This allows users
  to decide to ditch the contents of their TOC and "start over".
  It also has the effect of setting persistent objects which
  cause the logic in __setstate__ to basically be a noop after
  a single run.

- Added tests for manage_changeTOC and disabling inband gc.

- Changed default timeout for new TOCs to 60 seconds (this
  is helpful to prevent certain classes of conflicts, see
  http://www.plope.com/Members/dunny/conflicts for more info.



=== Products/Transience/dtml/manageTransientObjectContainer.dtml 1.9.16.2 => 1.9.16.3 ===
--- Products/Transience/dtml/manageTransientObjectContainer.dtml:1.9.16.2	Fri Sep 17 22:58:19 2004
+++ Products/Transience/dtml/manageTransientObjectContainer.dtml	Sun Oct 10 22:40:48 2004
@@ -120,29 +120,46 @@
      	value="&dtml-getDelNotificationTarget;" size=40>
   </td>
 </tr>
+<tr>
+  <td align="left" valign="top">
+   <div class="form-label">
+      Reset
+   </div>
+   <div class="form-help">
+       If reset is selected, submitting the form unconditionally deletes all
+       data from this transient object container.
+   </div>
+  </td>
+  <td align="left" valign="top">
+      <input class="form-element" type="checkbox" name="do_toc_reset">
+    </td>
+</tr>
 
-<dtml-let l=getLen>
-<dtml-if l>
 <tr>
 <td colspan=2>
-<br/>
-<p class="form-label">
+<p class="form-label" style="margin-top: 10px;">
 <font color="red">WARNING!</font>
 All data objects existing in this transient object container
-will be deleted when the data object timeout or expiration resolution
-is changed.
+will be deleted when this form is submitted if:
+
+<ul>
+  <li class="form-label"> the data object timeout or timeout resolution
+is changed </li>
+  <li class="form-label"> the "Reset" checkbox is checked </li>
+</ul>
+
 </p>
 </tr>
 </td>
-</dtml-if>
-</dtml-let>
 
 <tr>
   <td></td>
   <td>
   <input class="form-element" type="submit" name="submit" value=" Change ">
+
   </td>
 </tr>
+
 </table>
 </form>