From 13f2e8165d4d887c78ac5bda94583b9fef50398f Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Thu, 7 Oct 2010 14:41:17 +0000 Subject: [PATCH] Handle case when no tag has been defined. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38975 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../WebSection_getTagListFromUserPreferences.xml | 14 +++++++------- bt5/erp5_km/bt/revision | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSection_getTagListFromUserPreferences.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSection_getTagListFromUserPreferences.xml index dc494c9225..03d766472a 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSection_getTagListFromUserPreferences.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSection_getTagListFromUserPreferences.xml @@ -55,11 +55,9 @@ box = context.restrictedTraverse(box_relative_url)\n preferences = box.KnowledgeBox_getDefaultPreferencesDict()\n preferred_tag = preferences.get(\'preferred_tag\', None)\n if preferred_tag is not None:\n - subject_list_from_preferences=preferred_tag.split(\' \')\n - filtered_subject_list_from_preferences =[]\n - for x in subject_list_from_preferences:\n - filtered_subject_list_from_preferences.append("%" + x + "%")\n - return context.portal_catalog(subject=filtered_subject_list_from_preferences)\n + subject_list_from_preferences=[x for x in preferred_tag.split(\' \') if x!=\'\']\n + if subject_list_from_preferences:\n + return context.portal_catalog(subject=["%%%s%%" %tag for tag in subject_list_from_preferences])\n return []\n </string> </value> </item> @@ -105,10 +103,12 @@ return []\n <string>box</string> <string>preferences</string> <string>preferred_tag</string> - <string>subject_list_from_preferences</string> - <string>filtered_subject_list_from_preferences</string> + <string>append</string> + <string>$append0</string> <string>_getiter_</string> <string>x</string> + <string>subject_list_from_preferences</string> + <string>tag</string> </tuple> </value> </item> diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index c57dd514ec..80c632008f 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1581 \ No newline at end of file +1583 \ No newline at end of file -- 2.30.9