Skip to content

Z
Zope
Commit 20adcffd authored by Michel Pelletier's avatar Michel Pelletier
Browse files
Options

Fixed bug where catalog's not in the root folder did not recognize the 

proper URL of objects using the 'Find' machinery.  This caused all the
objects to mysteriously disapear when you updated the catalog (because
their paths were wrong)
parent 388a61f4
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 55 deletions
lib/python/Products/ZCatalog/CatalogAwareness.py
View file @ 20adcffd
...@@ -139,7 +139,8 @@ class CatalogAware: ...@@ -139,7 +139,8 @@ class CatalogAware:
return string.join(items, ', ') return string.join(items, ', ')
def onDeleteObject(self): def onDeleteObject(self):
"""Object delete handler.""" """Object delete handler. I think this is obsoleted by
manage_beforeDelete """
self.unindex_object() self.unindex_object()
def url(self, ftype=urllib.splittype, fhost=urllib.splithost): def url(self, ftype=urllib.splittype, fhost=urllib.splithost):
......
lib/python/Products/ZCatalog/catalogView.dtml
View file @ 20adcffd
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<TITLE>View Catalog Records</TITLE> <TITLE>View Catalog Records</TITLE>
</HEAD> </HEAD>
<BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555"> <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
<!--#var manage_tabs--> <dtml-var manage_tabs>
<!--#if searchResults--> <dtml-if searchResults>
<p> Updating the catalog will update all catalog records and remove <p> Updating the catalog will update all catalog records and remove
invalid records. Clearing the catalog will remove all entries. You invalid records. Clearing the catalog will remove all entries. You
...@@ -19,49 +19,39 @@ can also remove or update individual catalog records. ...@@ -19,49 +19,39 @@ can also remove or update individual catalog records.
<p> <p>
<!--#var id--> contains <dtml-var id> contains
<em><!--#var searchResults fmt=collection-length thousands_commas--></em> <em><dtml-var searchResults fmt=collection-length thousands_commas></em>
record(s).<BR><BR> record(s).<BR><BR>
<!--#in searchResults previous size=20 start=query_start --> <dtml-in searchResults previous size=20 start=query_start >
<a href="<!--#var URL-->?query_start=<!--#var <a href="<dtml-var URL>?query_start=<dtml-var previous-sequence-start-number>">
previous-sequence-start-number-->"> [Previous <dtml-var previous-sequence-size> entries]
[Previous <!--#var previous-sequence-size--> entries]
</a> </a>
<!--#/in--> </dtml-in>
<!--#in searchResults next size=20 start=query_start --> <dtml-in searchResults next size=20 start=query_start >
<a href="<!--#var URL-->?query_start=<!--#var <a href="<dtml-var URL>?query_start=<dtml-var next-sequence-start-number>">
next-sequence-start-number-->"> [Next <dtml-var next-sequence-size> entries]
[Next <!--#var next-sequence-size--> entries]
</a> </a>
<!--#/in--> </dtml-in>
<form action="<!--#var URL1-->/"> <form action="<dtml-var URL1>/">
<input type="submit" value=" Remove " NAME="manage_uncatalogObject:method"> <input type="submit" value=" Remove " NAME="manage_uncatalogObject:method">
<input type="submit" value=" Update " NAME="manage_catalogObject:method"> <input type="submit" value=" Update " NAME="manage_catalogObject:method">
<!--#comment-->
<input type="submit" value=" VOODOO "
NAME="manage_enterDebuger:method">
<!--#/comment-->
<input type="hidden" name="individual" value="1"> <input type="hidden" name="individual" value="1">
<table> <table>
<!--#in searchResults size=20 start=query_start --> <dtml-in searchResults size=20 start=query_start >
<tr valign=top> <tr valign=top>
<td valign="middle" align="center"> <td valign="middle" align="center">
<INPUT TYPE="checkbox" NAME="urls:list" VALUE="<!--#var "getpath(data_record_id_)"-->" <INPUT TYPE="checkbox" NAME="urls:list" VALUE="<dtml-var "getpath(data_record_id_)">"
</TD> </TD>
<td valign="top"><!--#var meta_type--></td> <td valign="top"><dtml-var meta_type></td>
<td valign="top" align="left"> <td valign="top" align="left">
<a href="../<dtml-var "getpath(data_record_id_)">/manage_main"><dtml-var "getpath(data_record_id_)">
<dtml-if title> (<dtml-var title>)</dtml-if></a>
<a href="<!--#var SCRIPT_NAME-->/<!--#var "getpath(data_record_id_)"-->/manage_main"><!--#var "getpath(data_record_id_)"--> </td>
<!--#if title--> (<!--#var title-->)<!--#/if--></a></td>
</tr> </tr>
</dtml-in>
<!--#/in-->
</table> </table>
<input type="submit" value=" Remove " NAME="manage_uncatalogObject:method"> <input type="submit" value=" Remove " NAME="manage_uncatalogObject:method">
...@@ -69,25 +59,26 @@ NAME="manage_enterDebuger:method"> ...@@ -69,25 +59,26 @@ NAME="manage_enterDebuger:method">
</form> </form>
<!--#in searchResults previous size=20 start=query_start --> <dtml-in searchResults previous size=20 start=query_start >
<a href="<!--#var URL-->?query_start=<!--#var <a href="<dtml-var URL>?query_start=<dtml-var previous-sequence-start-number>">
previous-sequence-start-number-->"> [Previous <dtml-var previous-sequence-size> entries]
[Previous <!--#var previous-sequence-size--> entries]
</a> </a>
<!--#/in--> </dtml-in>
<!--#in searchResults next size=20 start=query_start -->
<a href="<!--#var URL-->?query_start=<!--#var <dtml-in searchResults next size=20 start=query_start >
next-sequence-start-number-->"> <a href="<dtml-var URL>?query_start=<dtml-var next-sequence-start-number>">
[Next <!--#var next-sequence-size--> entries] [Next <dtml-var next-sequence-size> entries]
</a> </a>
<!--#/in--> </dtml-in>
<!--#else--> <dtml-else>
<P>There are no entries in the Catalog.</P> <P>There are no entries in the Catalog.</P>
<!--#/if--> </dtml-if>
</BODY>
</HTML>
</BODY></HTML>
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7