Add portal_type to query if specified.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33287 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml

@@ -132,13 +132,13 @@ for category in (\'group\', \'site\', \'function\', \'publication_section\', \'c
   if category_value not in MARKER:\n
     search_string += \' %s:%s\' % (category, category_value)\n
 \n
-# Category title search\n
+# contributor title search\n
 for category in (\'contributor_title\',):\n
   category_value = kw.get(category, request.get(category, None))\n
   if category_value not in MARKER:\n
     search_string += \' %s:%s\' %(category, category_value)\n
 \n
-#only my docs\n
+# only my docs\n
 mine = kw.get(\'mine\', request.get(\'mine\', None))\n
 if mine not in MARKER:\n
   search_string += \' mine:yes\'\n

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml

@@ -91,6 +91,9 @@ parsed_search_string = context.Base_parseSearchString(searchabletext)\n
 portal_type = parsed_search_string.get(\'portal_type\', None)\n
 if portal_type is None or not len(portal_type):\n
   query_kw[\'portal_type\'] = portal.getPortalDocumentTypeList()\n
+else:\n
+  # safe to add passed portal_type\n
+  query_kw[\'portal_type\'] = portal_type\n
 \n
 # ZSQLCatalog wants table.key to avoid ambiguity\n
 parsed_searchabletext = parsed_search_string.get(\'searchabletext\', None)\n
@@ -121,6 +124,8 @@ if parsed_search_string.get(\'mine\'):\n
   # user wants only his documents\n
   query_kw[\'owner\'] = str(portal.portal_membership.getAuthenticatedMember())\n
 \n
+# XXX: add contributor title\n
+\n
 if parsed_search_string.get(\'newest\'):\n
   #...and now we check for only the newest versions\n
   # but we need to preserve order\n

bt5/erp5_dms/bt/revision

-1079
+1081
\ No newline at end of file