From fc085f12ab7aca1510218d388360c464aa475a4f Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Thu, 8 Dec 2005 14:45:47 +0000 Subject: [PATCH] Better handling of empty list git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4560 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_core/ERP5Type_asSecurityGroupId.xml | 55 +++++++++---------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_asSecurityGroupId.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_asSecurityGroupId.xml index 36038f02bc..7088758489 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_asSecurityGroupId.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_asSecurityGroupId.xml @@ -80,10 +80,11 @@ code_list = []\n # sort the category list lexicographically\n # this prevents us to choose the exact order we want,\n # but also prevents some human mistake to f*ck everything up by creating site_function instead of function_site\n -category_list = []\n -if category_order not in (None, \'\', (), []):\n - category_list = [ x for x in category_order]\n -category_order = category_list.sort()\n +if category_order not in (None, \'\'):\n + category_order = [ x for x in category_order]\n + category_order.sort()\n +else:\n + category_order = []\n \n for base_category in category_order:\n category = kw[base_category]\n @@ -99,29 +100,28 @@ return \'_\'.join(code_list)\n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAABEAAAARAAAASwAA -AHMvAQAAZwAAfQIAZwAAfQMAfAAAdAMAZAEAZgAAZwAAZgQAagcAbzEAAWcAAARpBAB9BgB0BgB8 -AACDAQBEXRAAfQgAfAYAfAgAgwEAAXE5AH4GAH0DAG4BAAF0CAB8AwBkAgCDAgCDAAB9AAB4rQB0 -BgB8AACDAQBEXZ8AfQoAdAoAfAEAfAoAgwIAfQwAZAMAfAoAfAwAZgIAFn0NAHQIAHQIAHQOAGQE -AIMCAGQFAIMCAHwNAIMBAH0PAHwPAHQDAGQBAGYCAGoGAG8RAAFkBgBkBwB8DQAWggIAbgEAAXQI -AHwPAGQIAIMCAIMAAHAQAAF0CAB8DwBkCQCDAgCDAAB9EAB0CAB8AgBkCgCDAgB8EACDAQABcXUA -V3QIAGQLAGQMAIMCAHwCAIMBAFNkAABTKA0AAABOcwAAAABzBAAAAHNvcnRzBQAAACVzLyVzcxEA -AABwb3J0YWxfY2F0ZWdvcmllc3MQAAAAZ2V0Q2F0ZWdvcnlWYWx1ZXMbAAAAU2VjdXJpdHlSb2xl -RGVmaW5pdGlvbkVycm9ycxsAAABDYXRlZ29yeSAnJXMnIGRvZXNuJ3QgZXhpc3RzDwAAAGdldENv -ZGlmaWNhdGlvbnMFAAAAZ2V0SWRzBgAAAGFwcGVuZHMBAAAAX3MEAAAAam9pbigRAAAAcwkAAABj -b2RlX2xpc3RzDQAAAGNhdGVnb3J5X2xpc3RzDgAAAGNhdGVnb3J5X29yZGVycwQAAABOb25lcwYA -AABhcHBlbmRzCAAAACRhcHBlbmQwcwkAAABfZ2V0aXRlcl9zAQAAAHhzCQAAAF9nZXRhdHRyX3MN -AAAAYmFzZV9jYXRlZ29yeXMJAAAAX2dldGl0ZW1fcwIAAABrd3MIAAAAY2F0ZWdvcnlzDQAAAGNh -dGVnb3J5X3BhdGhzBwAAAGNvbnRleHRzDwAAAGNhdGVnb3J5X29iamVjdHMNAAAAY2F0ZWdvcnlf -Y29kZSgRAAAAcw4AAABjYXRlZ29yeV9vcmRlcnMCAAAAa3dzCQAAAGNvZGVfbGlzdHMNAAAAY2F0 -ZWdvcnlfbGlzdHMEAAAATm9uZXMGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGl0ZXJf -cwEAAAB4cwkAAABfZ2V0YXR0cl9zDQAAAGJhc2VfY2F0ZWdvcnlzCQAAAF9nZXRpdGVtX3MIAAAA -Y2F0ZWdvcnlzDQAAAGNhdGVnb3J5X3BhdGhzBwAAAGNvbnRleHRzDwAAAGNhdGVnb3J5X29iamVj -dHMNAAAAY2F0ZWdvcnlfY29kZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMaAAAARVJQ -NVR5cGVfYXNTZWN1cml0eUdyb3VwSWQBAAAAcyAAAAAACQYFBgEZARQAHQESAg0ABgEPARABHgET -AREBKAEUAigBAAAAcxoAAABFUlA1VHlwZV9hc1NlY3VyaXR5R3JvdXBJZCgBAAAAcxoAAABFUlA1 -VHlwZV9hc1NlY3VyaXR5R3JvdXBJZCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAA -PG1vZHVsZT4BAAAAcwAAAAA=</string> </value> + <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAABAAAAAOAAAASwAA +AHMnAQAAZwAAfQIAfAAAdAIAZAEAZgIAagcAb0EAAWcAAARpAwB9BQB0BQB8AACDAQBEXRAAfQcA +fAUAfAcAgwEAAXEtAH4FAH0AAHQHAHwAAGQCAIMCAIMAAAFuBwABZwAAfQAAeK0AdAUAfAAAgwEA +RF2fAH0JAHQJAHwBAHwJAIMCAH0LAGQDAHwJAHwLAGYCABZ9DAB0BwB0BwB0DQBkBACDAgBkBQCD +AgB8DACDAQB9DgB8DgB0AgBkAQBmAgBqBgBvEQABZAYAZAcAfAwAFoICAG4BAAF0BwB8DgBkCACD +AgCDAABwEAABdAcAfA4AZAkAgwIAgwAAfQ8AdAcAfAIAZAoAgwIAfA8AgwEAAXFtAFd0BwBkCwBk +DACDAgB8AgCDAQBTZAAAUygNAAAATnMAAAAAcwQAAABzb3J0cwUAAAAlcy8lc3MRAAAAcG9ydGFs +X2NhdGVnb3JpZXNzEAAAAGdldENhdGVnb3J5VmFsdWVzGwAAAFNlY3VyaXR5Um9sZURlZmluaXRp +b25FcnJvcnMbAAAAQ2F0ZWdvcnkgJyVzJyBkb2Vzbid0IGV4aXN0cw8AAABnZXRDb2RpZmljYXRp +b25zBQAAAGdldElkcwYAAABhcHBlbmRzAQAAAF9zBAAAAGpvaW4oEAAAAHMJAAAAY29kZV9saXN0 +cw4AAABjYXRlZ29yeV9vcmRlcnMEAAAATm9uZXMGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAA +X2dldGl0ZXJfcwEAAAB4cwkAAABfZ2V0YXR0cl9zDQAAAGJhc2VfY2F0ZWdvcnlzCQAAAF9nZXRp +dGVtX3MCAAAAa3dzCAAAAGNhdGVnb3J5cw0AAABjYXRlZ29yeV9wYXRocwcAAABjb250ZXh0cw8A +AABjYXRlZ29yeV9vYmplY3RzDQAAAGNhdGVnb3J5X2NvZGUoEAAAAHMOAAAAY2F0ZWdvcnlfb3Jk +ZXJzAgAAAGt3cwkAAABjb2RlX2xpc3RzBAAAAE5vbmVzBgAAAGFwcGVuZHMIAAAAJGFwcGVuZDBz +CQAAAF9nZXRpdGVyX3MBAAAAeHMJAAAAX2dldGF0dHJfcw0AAABiYXNlX2NhdGVnb3J5cwkAAABf +Z2V0aXRlbV9zCAAAAGNhdGVnb3J5cw0AAABjYXRlZ29yeV9wYXRocwcAAABjb250ZXh0cw8AAABj +YXRlZ29yeV9vYmplY3RzDQAAAGNhdGVnb3J5X2NvZGUoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5 +dGhvbilzGgAAAEVSUDVUeXBlX2FzU2VjdXJpdHlHcm91cElkAQAAAHMgAAAAAAkGBRMBFAAcAREC +BgINAAYBDwEQAR4BEwERASgBFAIoAQAAAHMaAAAARVJQNVR5cGVfYXNTZWN1cml0eUdyb3VwSWQo +AQAAAHMaAAAARVJQNVR5cGVfYXNTZWN1cml0eUdyb3VwSWQoAAAAACgAAAAAcw8AAABTY3JpcHQg +KFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -158,7 +158,6 @@ PG1vZHVsZT4BAAAAcwAAAAA=</string> </value> <string>category_order</string> <string>kw</string> <string>code_list</string> - <string>category_list</string> <string>None</string> <string>append</string> <string>$append0</string> -- 2.30.9