[Zope-Checkins] SVN: Zope/trunk/ - LP #142874: Naming objects ``URL`` or ``URL1`` broke several ZMI
Jens Vagelpohl
jens at dataflake.org
Tue May 25 07:17:01 EDT 2010
Log message for revision 112684:
- LP #142874: Naming objects ``URL`` or ``URL1`` broke several ZMI
views.
Changed:
U Zope/trunk/doc/CHANGES.rst
U Zope/trunk/src/App/dtml/manage.dtml
U Zope/trunk/src/App/dtml/manage_tabs.dtml
U Zope/trunk/src/OFS/dtml/fileEdit.dtml
U Zope/trunk/src/OFS/dtml/findFrame.dtml
U Zope/trunk/src/OFS/dtml/findResult.dtml
U Zope/trunk/src/OFS/dtml/history.dtml
U Zope/trunk/src/OFS/dtml/main.dtml
U Zope/trunk/src/OFS/dtml/properties.dtml
U Zope/trunk/src/OFS/dtml/propertyType.dtml
U Zope/trunk/src/OFS/dtml/propertysheets.dtml
U Zope/trunk/src/OFS/dtml/renameForm.dtml
-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/doc/CHANGES.rst 2010-05-25 11:17:01 UTC (rev 112684)
@@ -162,6 +162,9 @@
Bugs Fixed
++++++++++
+- LP #142874: Naming objects ``URL`` or ``URL1`` broke several ZMI
+ views.
+
- LP #142878: Remove URL-based suppression of access rules and site root
objects. Suppression using ``os.environ`` still works.
Modified: Zope/trunk/src/App/dtml/manage.dtml
===================================================================
--- Zope/trunk/src/App/dtml/manage.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/App/dtml/manage.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -19,14 +19,14 @@
<dtml-else>
<frameset rows="34, *">
</dtml-if>
- <frame src="&dtml-URL1;/manage_top_frame" name="manage_top_frame"
+ <frame src="<dtml-var "REQUEST.URL1" html_quote>/manage_top_frame" name="manage_top_frame"
marginheight="0" scrolling="no"/>
</dtml-if>
<frameset cols="175,*">
- <frame src="&dtml-URL1;/manage_menu" name="manage_menu"
+ <frame src="<dtml-var "REQUEST.URL1" html_quote>/manage_menu" name="manage_menu"
marginwidth="2" marginheight="2" scrolling="auto"/>
- <frame src="&dtml-URL1;/manage_workspace" name="manage_main"
+ <frame src="<dtml-var "REQUEST.URL1" html_quote>/manage_workspace" name="manage_main"
marginwidth="2" marginheight="2" scrolling="auto"/>
</frameset>
Modified: Zope/trunk/src/App/dtml/manage_tabs.dtml
===================================================================
--- Zope/trunk/src/App/dtml/manage_tabs.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/App/dtml/manage_tabs.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -59,7 +59,7 @@
align="center"><font face="Verdana, Arial, Helvetica"
size="1" color="#000000"> <a <dtml-if "s_item.get('action')"
>href="&dtml-action;"<dtml-else
- >href="&dtml-URL1;"</dtml-if
+ >href="<dtml-var "REQUEST.URL1" html_quote>"</dtml-if
><dtml-if "s_item.get('target')"> target="&dtml-target;"</dtml-if
>><span style="color: #000000;"><strong><dtml-var "s_item['label']"
></strong></span></a> </font></td>
@@ -68,7 +68,7 @@
align="center"><font face="Verdana, Arial, Helvetica"
size="1" color="#000000"> <a <dtml-if "s_item.get('action')"
>href="&dtml-action;"<dtml-else
- >href="&dtml-URL1;"</dtml-if
+ >href="<dtml-var "REQUEST.URL1" html_quote>"</dtml-if
><dtml-if "s_item.get('target')"> target="&dtml-target;"</dtml-if
>><span style="color: #000000;"><strong><dtml-var "s_item['label']"
></strong></span></a> </font></td>
Modified: Zope/trunk/src/OFS/dtml/fileEdit.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/fileEdit.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/OFS/dtml/fileEdit.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -10,7 +10,7 @@
text type and small enough to be edited in a text area.
</p>
-<form action="&dtml-URL1;" method="post" enctype="multipart/form-data">
+<form action="<dtml-var "REQUEST.URL1" html_quote>" method="post" enctype="multipart/form-data">
<table cellpadding="2" cellspacing="0" width="100%" border="0">
<tr>
<td align="left" valign="top">
Modified: Zope/trunk/src/OFS/dtml/findFrame.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/findFrame.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/OFS/dtml/findFrame.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -5,12 +5,12 @@
</HEAD>
<FRAMESET ROWS="52%,*">
<dtml-if cv_ffaf>
- <FRAME SRC="&dtml-URL1;/manage_findAdv" NAME="findForm"
+ <FRAME SRC="<dtml-var "REQUEST.URL1" html_quote>/manage_findAdv" NAME="findForm"
<dtml-else>
- <FRAME SRC="&dtml-URL1;/manage_findForm" NAME="findForm"
+ <FRAME SRC="<dtml-var "REQUEST.URL1" html_quote>/manage_findForm" NAME="findForm"
</dtml-if>
MARGINWIDTH="2" MARGINHEIGHT="2" SCROLLING="auto">
- <FRAME SRC="&dtml-URL1;/manage_findResult" NAME="findResult"
+ <FRAME SRC="<dtml-var "REQUEST.URL1" html_quote>/manage_findResult" NAME="findResult"
MARGINWIDTH="2" MARGINHEIGHT="0" SCROLLING="auto">
</FRAMESET>
<NOFRAMES>
Modified: Zope/trunk/src/OFS/dtml/findResult.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/findResult.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/OFS/dtml/findResult.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -60,13 +60,13 @@
<td width="50%">
<div class="list-item">
<dtml-in name="results" previous size="batch_size" start="query_start">
- <strong> <a href="&dtml-URL;&dtml-sequence-query;query_start=&dtml-previous-sequence-start-number;">< Previous</a></strong>
+ <strong> <a href="<dtml-var "REQUEST.URL" html_quote>&dtml-sequence-query;query_start=&dtml-previous-sequence-start-number;">< Previous</a></strong>
<dtml-else> </dtml-in></div>
</td>
<td align="right" width="50%">
<div class="list-item">
<dtml-in name="results" next size=batch_size start=query_start>
- <strong><a href="&dtml-URL;&dtml-sequence-query;query_start=&dtml-next-sequence-start-number;">Next ></a></strong>
+ <strong><a href="<dtml-var "REQUEST.URL" html_quote>&dtml-sequence-query;query_start=&dtml-next-sequence-start-number;">Next ></a></strong>
<dtml-else> </dtml-in></div>
</td>
</tr>
Modified: Zope/trunk/src/OFS/dtml/history.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/history.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/OFS/dtml/history.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -2,7 +2,7 @@
<dtml-var manage_tabs>
<dtml-if manage_change_history>
- <form action="&dtml-URL1;" method="POST">
+ <form action="<dtml-var "REQUEST.URL1" html_quote>" method="POST">
<table width="100%" cellspacing="0" cellpadding="2" border="0">
<tr class="list-header">
@@ -10,7 +10,7 @@
<div class="list-nav">
<dtml-if first_transaction>
<dtml-with expr="_(next=first_transaction*2-last_transaction)">
- <a href="&dtml-URL;?first_transaction:int=&dtml.-next;&last_transaction:int=&dtml.-first_transaction;&HistoryBatchSize:int=&dtml.-HistoryBatchSize;">< Later Revisions</a>
+ <a href="<dtml-var "REQUEST.URL" html_quote>?first_transaction:int=&dtml.-next;&last_transaction:int=&dtml.-first_transaction;&HistoryBatchSize:int=&dtml.-HistoryBatchSize;">< Later Revisions</a>
</dtml-with>
<dtml-else>
@@ -21,7 +21,7 @@
<div class="list-nav">
<dtml-if expr="_.len(manage_change_history) == HistoryBatchSize">
<dtml-with expr="_(last=last_transaction+HistoryBatchSize)">
- <a href="&dtml-URL;?first_transaction:int=&dtml.-last_transaction;&last_transaction:int=&dtml.-last;&HistoryBatchSize:int=&dtml.-HistoryBatchSize;">Earlier Revisions ></a>
+ <a href="<dtml-var "REQUEST.URL" html_quote>?first_transaction:int=&dtml.-last_transaction;&last_transaction:int=&dtml.-last;&HistoryBatchSize:int=&dtml.-HistoryBatchSize;">Earlier Revisions ></a>
</dtml-with>
<dtml-else>
Modified: Zope/trunk/src/OFS/dtml/main.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/main.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/OFS/dtml/main.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -34,10 +34,10 @@
<td align="left" valign="top"> </td>
<td align="right" valign="top">
<div class="form-element">
- <form action="&dtml-URL1;/" method="get">
+ <form action="<dtml-var "REQUEST.URL1" html_quote>/" method="get">
<dtml-if "_.len(filtered_meta_types) > 1">
<select class="form-element" name=":action"
- onChange="location.href='&dtml-URL1;/'+this.options[this.selectedIndex].value">
+ onChange="location.href='<dtml-var "REQUEST.URL1" html_quote>/'+this.options[this.selectedIndex].value">
<option value="manage_workspace" disabled>Select type to add...</option>
<dtml-in filtered_meta_types mapping sort=name>
<dtml-if action>
@@ -59,7 +59,7 @@
</table>
</dtml-if>
-<form action="&dtml-URL1;/" name="objectItems" method="post">
+<form action="<dtml-var "REQUEST.URL1" html_quote>/" name="objectItems" method="post">
<dtml-if objectItems>
<dtml-let hasOrderSupport="_.getattr(this().aq_explicit, 'has_order_support', 0)">
<dtml-unless skey>
Modified: Zope/trunk/src/OFS/dtml/properties.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/properties.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/OFS/dtml/properties.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -25,7 +25,7 @@
<dtml-var manage_tabs>
</dtml-with>
-<form action="&dtml-URL1;" method="post">
+<form action="<dtml-var "REQUEST.URL1" html_quote>" method="post">
<dtml-if propertyMap>
<p class="form-help">
Properties allow you to assign simple values to Zope objects. To change
@@ -222,7 +222,7 @@
<dtml-if property_extensible_schema__>
-<form action="&dtml-URL1;/manage_addProperty" method="post">
+<form action="<dtml-var "REQUEST.URL1" html_quote>/manage_addProperty" method="post">
<p class="form-help">
To add a new property, enter a name, type and value for the new
Modified: Zope/trunk/src/OFS/dtml/propertyType.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/propertyType.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/OFS/dtml/propertyType.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -20,7 +20,7 @@
</dtml-if>
</dtml-unless>
-<form action="&dtml-URL1;" method="POST">
+<form action="<dtml-var "REQUEST.URL1" html_quote>" method="POST">
<dtml-if old_ids>
<p>
To change property names and values, edit them and click
Modified: Zope/trunk/src/OFS/dtml/propertysheets.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/propertysheets.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/OFS/dtml/propertysheets.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -1,7 +1,7 @@
<dtml-var manage_page_header>
<dtml-var manage_tabs>
-<form action="&dtml-URL1;" method="post">
+<form action="<dtml-var "REQUEST.URL1" html_quote>" method="post">
<table cellspacing="0" cellpadding="2" border="0">
<dtml-in items sort>
<dtml-with "_(REQUEST=REQUEST, item=_['sequence-item'].aq_base, isDeletable=isDeletable)" only>
Modified: Zope/trunk/src/OFS/dtml/renameForm.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/renameForm.dtml 2010-05-25 11:16:53 UTC (rev 112683)
+++ Zope/trunk/src/OFS/dtml/renameForm.dtml 2010-05-25 11:17:01 UTC (rev 112684)
@@ -7,7 +7,7 @@
)">
<dtml-if expr="REQUEST.has_key('ids')">
-<form action="&dtml-URL1;" method="post">
+<form action="<dtml-var "REQUEST.URL1" html_quote>" method="post">
<table border="0">
<dtml-in expr="manage_CopyContainerAllItems(REQUEST)">
<tr>
More information about the Zope-Checkins
mailing list