[Erp5-report] r24913 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Dec 17 10:21:48 2008
New Revision: 24913

URL: http://svn.erp5.org?rev=24913&view=rev
Log:
Avoid checking ids for header row

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml?rev=24913&r1=24912&r2=24913&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml [utf8] Wed Dec 17 10:21:48 2008
@@ -97,7 +97,7 @@
   property_id_list = []\n
 \n
 \n
-def getIDFromString(string=None):\n
+def getIDFromString(string=None, force=0):\n
   """\n
     This function transform a string to a safe and beautiful ID.\n
     It is used here to create a safe category ID from a string.\n
@@ -130,7 +130,7 @@
   while len(clean_id) > 0 and not clean_id[-1].isalnum():\n
     clean_id = clean_id[:-1]\n
 \n
-  if clean_id in property_id_list:\n
+  if clean_id in property_id_list and not force:\n
     invalid_spreadsheet_error_handler(translateString(\n
          "The ID ${id} is invalid, it\'s a reserved property name",\n
          mapping=dict(id=clean_id)))\n
@@ -167,7 +167,7 @@
   column_index = 0\n
   path_index = 0\n
   for column in columns_header:\n
-    column_id = getIDFromString(column)\n
+    column_id = getIDFromString(column, force=1)\n
     # This give us the information that the path definition has started\n
     path_def_started = \'path_0\' in property_map.values()\n
     # The path of the category has started to be expressed\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=24913&r1=24912&r2=24913&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Dec 17 10:21:48 2008
@@ -1,1 +1,1 @@
-1044
+1046