[Zope-Checkins] CVS: Zope/lib/python/App/dtml - davLockManager.dtml:1.2.184.2 profile.dtml:1.4.174.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/App/dtml
In directory cvs.zope.org:/tmp/cvs-serv7594/dtml

Modified Files:
      Tag: chrism-install-branch
	davLockManager.dtml profile.dtml 
Log Message:
Merge with HEAD.


=== Zope/lib/python/App/dtml/davLockManager.dtml 1.2.184.1 => 1.2.184.2 ===
--- Zope/lib/python/App/dtml/davLockManager.dtml:1.2.184.1	Sat Oct 26 15:51:37 2002
+++ Zope/lib/python/App/dtml/davLockManager.dtml	Sun Nov 24 18:32:02 2002
@@ -25,7 +25,8 @@
 //-->
 </script>
 
-<dtml-let lockedobjs="REQUEST.form.has_key('frompath','') and findLockedObjects(frompath=REQUEST.get('frompath','')) or []">
+<dtml-let from_path="REQUEST.form.get('frompath',None)"
+          lockedobjs="from_path and findLockedObjects(frompath=from_path) or []">
 
 <dtml-if lockedobjs>
  <p class="std-text">All locked objects


=== Zope/lib/python/App/dtml/profile.dtml 1.4 => 1.4.174.1 ===
--- Zope/lib/python/App/dtml/profile.dtml:1.4	Wed Apr 11 13:48:03 2001
+++ Zope/lib/python/App/dtml/profile.dtml	Sun Nov 24 18:32:02 2002
@@ -3,7 +3,9 @@
 
 <dtml-let sort="REQUEST.get('sort', 'time')"
           limit="REQUEST.get('limit', 100)" 
-          stats="manage_profile_stats(sort, limit)">
+          mode="REQUEST.get('mode', 'stats')" 
+          stripDirs="REQUEST.get('stripDirs', 1)" 
+          stats="manage_profile_stats(sort, limit, stripDirs, mode)">
 <dtml-if stats>
 <p class="form-help">
 Profiling information is generated using the standard Python 
@@ -31,6 +33,19 @@
     <dtml-in "(100, 200, 300, 400, 500)">
     <option value="<dtml-var sequence-item>"<dtml-if 
      "limit==_['sequence-item']"> selected</dtml-if>><dtml-var 
+    sequence-item>
+    </dtml-in>
+    </select>
+</td>
+<td><strong>strip Dirs</strong>: 
+    <input type=hidden name="stripDirs:int:default" value="0">
+    <input type=checkbox name="stripDirs:int" value="1" <dtml-if stripDirs>checked</dtml-if>>
+</td>
+<td><strong>Mode</strong>: 
+    <select name="mode">
+    <dtml-in "('stats', 'callees', 'callers',)">
+    <option value="<dtml-var sequence-item>"<dtml-if 
+     "mode==_['sequence-item']"> selected</dtml-if>><dtml-var 
     sequence-item>
     </dtml-in>
     </select>