diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/PersonModule_generateDomain.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/PersonModule_generateDomain.xml index e561c7f49c97e5da3dfa7d6286749567f50d0824..35b4570a994d1df1489d52b867cbbb8285a996be 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/PersonModule_generateDomain.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/PersonModule_generateDomain.xml @@ -80,8 +80,6 @@ if depth == 0:\n selection_name= \'person_module_selection\')\n \n else:\n - #url = category.getProperty(\'membership_criterion_category\')\n - #category_list = url.searchFolder()\n return domain_list\n \n for category in category_list:\n @@ -94,7 +92,6 @@ for category in category_list:\n \n domain_list.append(domain)\n \n -context.log("%s on %s" % (script.getId(), context.getPath()), "%d objects domain" % len(domain_list))\n return domain_list\n </string> </value> </item> @@ -159,7 +156,6 @@ return domain_list\n <string>category</string> <string>domain</string> <string>script</string> - <string>len</string> </tuple> </value> </item> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/PersonModule_getMovementHistoryList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/PersonModule_getMovementHistoryList.xml index dab0cf9b00d2ae7a5390765464d796ae4f2e3a9a..77c69a1accd8c660d2789c8c701c784bede30ca2 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/PersonModule_getMovementHistoryList.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/PersonModule_getMovementHistoryList.xml @@ -70,7 +70,6 @@ <key> <string>_body</string> </key> <value> <string>node = context.portal_selections.getSelectionUidList(context=context, REQUEST=context.REQUEST, \n selection_name=\'person_module_selection\')\n -context.log("on %s" % context.getPath(), "%d uids at node." % len(node))\n \n # Select only the usabe part\n main_axis_begin = context.REQUEST.get(\'list_start\', 0)\n @@ -79,7 +78,6 @@ planning_box = form.get_field(\'planning_box\')\n main_axis_end = main_axis_begin + planning_box.get_value(\'main_axis_groups\')\n \n node_uid_list = node[main_axis_begin:main_axis_end]\n -context.log("on %s" % context.getPath(), "%d uids at node uid list." % len(node_uid_list))\n \n acceptable_state_list = context.getPortalFutureInventoryStateList() + \\\n context.getPortalReservedInventoryStateList() + \\\n @@ -95,14 +93,12 @@ movement_list = context.portal_simulation.getMovementHistoryList(\n omit_mirror_date=0,\n )\n \n -#return movement_list\n \n # XXX It is a bad idea to return order_value or delivery_value,\n # because same object can be displayed multiple time in some cases\n \n return_list = []\n \n -# XXX This part is an approximtion for sevran\n # Normally, simulation movement should only have 1 order value\n for mvt_obj in movement_list:\n # XXX Can\'t we use a brain instead ?\n @@ -112,7 +108,6 @@ for mvt_obj in movement_list:\n mvt_obj = obj\n return_list.append(mvt_obj)\n \n -context.log("on %s" % context.getPath(), "%d objects returned." % len(return_list))\n return return_list\n </string> </value> </item> @@ -169,7 +164,6 @@ return return_list\n <string>_getattr_</string> <string>context</string> <string>node</string> - <string>len</string> <string>main_axis_begin</string> <string>getattr</string> <string>form</string> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Person_generateTaskDomain.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Person_generateTaskDomain.xml index beacc9a2c1f9441805d4c6999b48f9706bafe01d..38e12100d20413fbd5ecda2c7b072899b9a35a62 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Person_generateTaskDomain.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Person_generateTaskDomain.xml @@ -76,12 +76,9 @@ if object_path is None:\n domain_list = []\n \n if depth == 0:\n - url = [context.person_module.restrictedTraverse(object_path)]\n - category_list = url\n + category_list = [context.person_module.restrictedTraverse(object_path)]\n \n else:\n - #url = category.getProperty(\'membership_criterion_category\')\n - #category_list = url.searchFolder()\n return domain_list\n \n for category in category_list:\n @@ -153,7 +150,6 @@ return domain_list\n <string>None</string> <string>_getitem_</string> <string>domain_list</string> - <string>url</string> <string>category_list</string> <string>_getiter_</string> <string>category</string> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Person_getMovementHistoryList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Person_getMovementHistoryList.xml index ee59a122f83c2691ca331224dd229d9a429730d2..d93bc0fdfc93a9011f11b6860640808cef04cce3 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Person_getMovementHistoryList.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Person_getMovementHistoryList.xml @@ -84,17 +84,12 @@ movement_list = context.portal_simulation.getMovementHistoryList(\n omit_mirror_date=0,\n )\n \n -# return movement_list\n \n # XXX It is a bad idea to return order_value or delivery_value,\n # because same object can be displayed multiple time in some cases\n \n -# XXX Simulation movement should not be editable\n -# Same for blocks on which user does not have write permission\n -\n return_list = []\n \n -# XXX This part is an approximtion for sevran\n # Normally, simulation movement should only have 1 order value\n for mvt_obj in movement_list:\n # XXX Can\'t we use a brain instead ?\n diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index f9c94c8318066ba562fd1ce1e14753071396ea54..98c1572f67e72c2c54c6e949b21406e146df0b5b 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -325 \ No newline at end of file +327 \ No newline at end of file