[Erp5-report] r41274 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplat...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Dec 9 16:20:02 CET 2010
Author: jerome
Date: Thu Dec 9 16:20:02 2010
New Revision: 41274
URL: http://svn.erp5.org?rev=41274&view=rev
Log:
add an option to create or not local properties from spreadsheet columns that are not category properties
Added:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog/your_create_local_property.xml
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml?rev=41274&r1=41273&r2=41274&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml [utf8] Thu Dec 9 16:20:02 2010
@@ -52,6 +52,7 @@
<key> <string>_body</string> </key>
<value> <string>from Products.ERP5Type.Message import translateString\n
from Products.ERP5Type.Document import newTempBase\n
+portal = context.getPortalObject()\n
\n
# Initialise some general variables\n
detailed_report_result = []\n
@@ -60,13 +61,15 @@ base_category_id_list = []\n
category_path_dict = {}\n
simulation_new_category_id_list = []\n
\n
-property_id_list = context.portal_classes.getPropertySheetPropertyIdList()\n
+property_id_list = portal.portal_classes.getPropertySheetPropertyIdList()\n
+category_property_id_list = None\n
\n
+getRelatedValueList = portal.portal_categories.getRelatedValueList\n
def Object_hasRelation(obj):\n
# Check if there is some related objets.\n
result = 0\n
for o in obj.getIndexableChildValueList():\n
- for related in obj.portal_categories.getRelatedValueList(o):\n
+ for related in getRelatedValueList(o):\n
related_url = related.getRelativeUrl()\n
if related_url.startswith(obj.getRelativeUrl()):\n
continue\n
@@ -172,6 +175,8 @@ for base_category, category_list in \\\n
category_path_dict[base_path_obj.getRelativeUrl()] = None\n
is_base_category = False\n
parent_path = category[\'path\'].split(category_id)[0] +category_id\n
+\n
+ property_id_list = base_path_obj.propertyIds() # XXX could be cached\n
if is_valid_category:\n
# Only try to update a valid category\n
new_category = base_path_obj\n
@@ -182,6 +187,18 @@ for base_category, category_list in \\\n
key = str(key)\n
if key not in [\'path\', \'id\']:\n
value = category[key]\n
+\n
+ if not create_local_property and key not in property_id_list:\n
+ # if we do not create local properties, then we skip properties\n
+ # that are not in category ids\n
+ report_line = newTempBase(context, \'item\')\n
+ report_line.edit(field_type=\'Update\',\n
+ field_category=new_category.getRelativeUrl(),\n
+ field_message=translateString("Ignoring local property ${key} with value ${value}",\n
+ mapping=dict(key=key, value=value)))\n
+ detailed_report_append(report_line)\n
+ continue\n
+\n
if is_new_category:\n
# Always update properties if this a new category\n
category_update_dict[key] = value\n
@@ -231,6 +248,7 @@ for base_category, category_list in \\\n
detailed_report_append(report_line)\n
if not is_new_category and category_update_dict:\n
updated_category_counter += 1\n
+\n
if not simulation_mode:\n
# force_update=1 is required here because\n
# edit(short_title=\'foo\', title=\'foo\') only stores short_title property.\n
@@ -330,7 +348,7 @@ return context.REQUEST.RESPONSE.redirect
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>import_file, update_existing_property=False, keep_existing_category=True, detailed_report=False, simulation_mode=False, displayed_report=[], effective_date=None, expiration_date=None, existing_category_list=\'keep\', **kw</string> </value>
+ <value> <string>import_file, update_existing_property=False, keep_existing_category=True, detailed_report=False, simulation_mode=False, displayed_report=[], effective_date=None, expiration_date=None, existing_category_list=\'keep\', create_local_property=False, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -350,7 +368,7 @@ return context.REQUEST.RESPONSE.redirect
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>9</int> </value>
+ <value> <int>10</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
@@ -365,19 +383,24 @@ return context.REQUEST.RESPONSE.redirect
<string>effective_date</string>
<string>expiration_date</string>
<string>existing_category_list</string>
+ <string>create_local_property</string>
<string>kw</string>
<string>Products.ERP5Type.Message</string>
<string>translateString</string>
<string>Products.ERP5Type.Document</string>
<string>newTempBase</string>
- <string>detailed_report_result</string>
<string>_getattr_</string>
+ <string>context</string>
+ <string>portal</string>
+ <string>detailed_report_result</string>
<string>detailed_report_append</string>
<string>base_category_id_list</string>
<string>category_path_dict</string>
<string>simulation_new_category_id_list</string>
- <string>context</string>
<string>property_id_list</string>
+ <string>None</string>
+ <string>category_property_id_list</string>
+ <string>getRelatedValueList</string>
<string>Object_hasRelation</string>
<string>isValidID</string>
<string>new_category_counter</string>
@@ -414,7 +437,6 @@ return context.REQUEST.RESPONSE.redirect
<string>category_type</string>
<string>report_line</string>
<string>dict</string>
- <string>None</string>
<string>new_category</string>
<string>category_update_dict</string>
<string>first_update_reported</string>
@@ -448,6 +470,7 @@ return context.REQUEST.RESPONSE.redirect
<none/>
<none/>
<string>keep</string>
+ <int>0</int>
</tuple>
</value>
</item>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog.xml?rev=41274&r1=41273&r2=41274&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog.xml [utf8] Thu Dec 9 16:20:02 2010
@@ -75,6 +75,7 @@
<string>your_import_file</string>
<string>your_effective_date</string>
<string>your_update_existing_property</string>
+ <string>your_create_local_property</string>
<string>your_existing_category_list</string>
<string>your_expiration_date</string>
<string>your_detailed_report</string>
Added: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog/your_create_local_property.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog/your_create_local_property.xml?rev=41274&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog/your_create_local_property.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_viewImportCategoryFileDialog/your_create_local_property.xml [utf8] Thu Dec 9 16:20:02 2010
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>your_create_local_property</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Check this box if you want to create local properties for columns that does not exist in categories schema.</string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Create Local Properties</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
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=41274&r1=41273&r2=41274&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Dec 9 16:20:02 2010
@@ -1 +1 @@
-40833
\ No newline at end of file
+40834
\ No newline at end of file
More information about the Erp5-report
mailing list