[Erp5-report] r37358 jerome - in /erp5/trunk/bt5/erp5_project: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Jul 29 09:28:20 2010
New Revision: 37358

URL: http://svn.erp5.org?rev=37358&view=rev
Log:
fix the usual problem of searching for "project_module/x%" that also matches  "project_module/xxx"

Modified:
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateTaskDomain.xml
    erp5/trunk/bt5/erp5_project/bt/revision

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml?rev=37358&r1=37357&r2=37358&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml [utf8] Thu Jul 29 09:28:20 2010
@@ -71,7 +71,7 @@ for category in category_list:\n
   sub_category_list = [category]\n
   while sub_category_list:\n
     sub_category = sub_category_list.pop()\n
-    membership_criterion_category.append(\'source_project/%s\' % sub_category.getRelativeUrl())\n
+    membership_criterion_category.append(\'source_project/%s/\' % sub_category.getRelativeUrl())\n
     sub_category_list.extend(sub_category.contentValues(portal_type=\'Project Line\'))\n
 \n
   domain.edit(title = category.getTitle(),\n

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml?rev=37358&r1=37357&r2=37358&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml [utf8] Thu Jul 29 09:28:20 2010
@@ -69,7 +69,7 @@ params = portal.portal_selections.getSel
 object_path = request.get(\'object_path\')\n
 if object_path is None:\n
   object_path = context.REQUEST.get(\'URL1\').split(\'/\')[-1]\n
-search_path = \'\'.join(["%project_module/", object_path,"%"])\n
+search_path = \'project_module/%s/%%\' % object_path\n
 category_list = []\n
 \n
 year = here.getStartDate().year()\n

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateTaskDomain.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateTaskDomain.xml?rev=37358&r1=37357&r2=37358&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateTaskDomain.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateTaskDomain.xml [utf8] Thu Jul 29 09:28:20 2010
@@ -59,7 +59,7 @@ object_path = request.get(\'object_path\
 if object_path is None:\n
   object_path = context.REQUEST.get(\'URL1\').split(\'/\')[-1]\n
 \n
-search_path = \'\'.join(["%project_module/", object_path,"%"])\n
+search_path = \'project_module/%s/%%\'\n
 \n
 if depth == 0:\n
   category_list = []\n

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=37358&r1=37357&r2=37358&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Thu Jul 29 09:28:20 2010
@@ -1 +1 @@
-767
\ No newline at end of file
+768
\ No newline at end of file