Skip to content

Commit

Permalink
removed extra object find step
Browse files Browse the repository at this point in the history
  • Loading branch information
Michel Pelletier committed Jun 24, 1999
1 parent 25eb3ad commit f45ba05
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 117 deletions.
29 changes: 29 additions & 0 deletions ZCatalog.py
Expand Up @@ -239,6 +239,35 @@ def manage_catalogClear(self, REQUEST):
manage_tabs_message=message)


def manage_catalogFoundItems(self, REQUEST, obj_metatypes=None,
obj_ids=None, obj_searchterm=None,
obj_expr=None, obj_mtime=None,
obj_mspec=None, obj_roles=None,
obj_permission=None):

""" Find object according to search criteria and Catalog them
"""

results = self.ZopeFind(REQUEST.PARENTS[-1],
obj_metatypes=obj_metatypes,
obj_ids=obj_ids,
obj_searchterm=obj_searchterm,
obj_expr=obj_expr,
obj_mtime=obj_mtime,
obj_mspec=obj_mspec,
obj_permission=obj_permission,
obj_roles=obj_roles,
search_sub=1,
REQUEST=REQUEST)

for n in results:
self.catalog_object(n[1], n[0])

message = "Objects Cataloged"
return self.manage_main(self, REQUEST,
manage_tabs_message=message)


def manage_addColumn(self, name, REQUEST):
""" add a column """
self._catalog.addColumn(name)
Expand Down
5 changes: 2 additions & 3 deletions catalogFind.dtml
Expand Up @@ -8,7 +8,7 @@
Use this form to locate objects to be cataloged.
<P>

<FORM ACTION="manage_catalogFindResult" METHOD="GET">
<FORM ACTION="manage_catalogFoundItems" METHOD="GET">
<TABLE>
<TR>
<TD ALIGN="LEFT" VALIGN="TOP">
Expand Down Expand Up @@ -77,7 +77,6 @@ Use this form to locate objects to be cataloged.
</TD>
</TR>

<!--#comment-->
<TR>
<TD ALIGN="LEFT" VALIGN="TOP">
<STRONG>have permission:</STRONG>
Expand All @@ -90,7 +89,7 @@ Use this form to locate objects to be cataloged.
</SELECT>
</TD>
</TR>
<!--#/comment-->


<INPUT TYPE="HIDDEN" NAME="search_sub:int" VALUE="1" CHECKED>

Expand Down
14 changes: 0 additions & 14 deletions catalogFindFrame.dtml

This file was deleted.

100 changes: 0 additions & 100 deletions catalogFindResult.dtml

This file was deleted.

0 comments on commit f45ba05

Please sign in to comment.