[Erp5-report] r18989 - /erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Feb 1 18:06:35 CET 2008
Author: jp
Date: Fri Feb 1 18:06:35 2008
New Revision: 18989
URL: http://svn.erp5.org?rev=18989&view=rev
Log:
Use script instead of expressions.
Modified:
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermsFromPropertySheetDialog.xml
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml?rev=18989&r1=18988&r2=18989&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml Fri Feb 1 18:06:35 2008
@@ -65,52 +65,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>ignore = (\'custom\',)\n
-all_field_list = []\n
-def iterate(obj):\n
- for i in obj.objectValues():\n
- if i.getId() in ignore:\n
- continue\n
- if i.meta_type==\'ERP5 Form\':\n
- all_field_list.extend(i.objectValues())\n
- elif i.isPrincipiaFolderish:\n
- iterate(i)\n
-\n
-iterate(context.portal_skins)\n
-\n
-properties = []\n
-for i in property_sheet_list:\n
- properties.extend(context.GlossaryModule_getPropertySheetAttributeList(i))\n
-\n
-dic = {}\n
-for i in all_field_list:\n
- id = i.getId()\n
- title = i.get_value(\'title\') or \'\'\n
- skin_id = i.aq_parent.aq_parent.getId()\n
- prefix = \'erp5_\'\n
- if skin_id.startswith(prefix):\n
- skin_id = skin_id[len(prefix):]\n
- if id.startswith(\'my_\'):\n
- for p in properties:\n
- if id==\'my_%s\' % p:\n
- key = (p, skin_id, title)\n
- dic[key] = i\n
- if id.startswith(\'your_\'):\n
- for p in properties:\n
- if id==\'your_%s\' % p:\n
- key = (p, skin_id, title)\n
- dic[key] = i\n
-\n
-result = []\n
-for (reference, business_field, title) in dic.keys():\n
- language = \'en\'\n
- field = dic[(reference, business_field, title)]\n
- description = field.get_value(\'description\')\n
- result.append({\'reference\':reference,\n
- \'language\':language,\n
- \'business_field\':business_field,\n
- \'title\':title,\n
- \'description\':description})\n
+ <value> <string>result = context.GlossaryModule_getTermDictListFromPropertySheet(property_sheet_list)\n
\n
if export_tsv:\n
for i in result:\n
@@ -173,31 +128,13 @@
<string>kw</string>
<string>_print_</string>
<string>_print</string>
- <string>ignore</string>
- <string>all_field_list</string>
- <string>iterate</string>
<string>_getattr_</string>
<string>context</string>
- <string>properties</string>
+ <string>result</string>
<string>_getiter_</string>
<string>i</string>
- <string>dic</string>
- <string>id</string>
- <string>title</string>
- <string>skin_id</string>
- <string>prefix</string>
+ <string>map</string>
<string>_getitem_</string>
- <string>len</string>
- <string>p</string>
- <string>key</string>
- <string>_write_</string>
- <string>result</string>
- <string>reference</string>
- <string>business_field</string>
- <string>language</string>
- <string>field</string>
- <string>description</string>
- <string>map</string>
<string>new_id</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml?rev=18989&r1=18988&r2=18989&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml Fri Feb 1 18:06:35 2008
@@ -135,7 +135,9 @@
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
+ <string>Authenticated</string>
<string>Manager</string>
+ <string>Member</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermsFromPropertySheetDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermsFromPropertySheetDialog.xml?rev=18989&r1=18988&r2=18989&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermsFromPropertySheetDialog.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFindTermsFromPropertySheetDialog.xml Fri Feb 1 18:06:35 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.Form</string>
- <string>ERP5Form</string>
- </tuple>
- <none/>
+ <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -74,34 +71,31 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>hidden</string> </key>
+ <key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
- <list>
- <string>my_property_sheet_list</string>
- <string>my_export_tsv</string>
- </list>
+ <list/>
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list/>
</value>
More information about the Erp5-report
mailing list