[Erp5-report] r44433 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: PathTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Mar 18 16:35:54 CET 2011
Author: gabriel
Date: Fri Mar 18 16:35:53 2011
New Revision: 44433
URL: http://svn.erp5.org?rev=44433&view=rev
Log:
rename script according to your right context
Added:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_generateDomain.xml
Removed:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPageModule_generateDomain.xml
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/PathTemplateItem/portal_domains/ung_domain/by_subject.xml
erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
Modified: erp5/trunk/bt5/erp5_web_ung_theme/PathTemplateItem/portal_domains/ung_domain/by_subject.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/PathTemplateItem/portal_domains/ung_domain/by_subject.xml?rev=44433&r1=44432&r2=44433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/PathTemplateItem/portal_domains/ung_domain/by_subject.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/PathTemplateItem/portal_domains/ung_domain/by_subject.xml [utf8] Fri Mar 18 16:35:53 2011
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>domain_generator_method_id</string> </key>
- <value> <string>WebPageModule_generateDomain</string> </value>
+ <value> <string>ERP5Site_generateDomain</string> </value>
</item>
<item>
<key> <string>id</string> </key>
Added: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_generateDomain.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_generateDomain.xml?rev=44433&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_generateDomain.xml (added)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_generateDomain.xml [utf8] Fri Mar 18 16:35:53 2011
@@ -0,0 +1,137 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+"""\n
+ This script generates a sections list to filter the document on UNG Docs.\n
+"""\n
+\n
+from Products.ERP5Type.Cache import CachingMethod\n
+\n
+def getAvailableSubjectList(subject_list=()):\n
+ """\n
+ Returns the list of available subjects for all documents\n
+ located in the current container (if defined) and which\n
+ already match all subjects of subject_list\n
+ """\n
+ subject_list = ()\n
+ portal_type_list = ["Web Table", "Web Page", "Web Illustration"]\n
+ kw = dict(portal_type=portal_type_list,\n
+ subject="!=",)\n
+ subject_len = len(subject_list)\n
+ result_list = context.portal_catalog(**kw)\n
+\n
+ subject_list = []\n
+ for keyword_list in filter(lambda x: x not in subject_list, \n
+ map(lambda r: r.subject, result_list)):\n
+ for keyword in keyword_list:\n
+ if keyword not in subject_list:\n
+ subject_list.append(keyword)\n
+\n
+ return subject_list\n
+\n
+def appendTempDomain(id, \n
+ title,\n
+ property_dict,\n
+ parent=parent,\n
+ membership_criterion_base_category=(),\n
+ membership_criterion_category=()):\n
+ domain = parent.generateTempDomain(id=id)\n
+ domain.edit(title=title,\n
+ domain_generator_method_id=script.id,\n
+ membership_criterion_base_category=membership_criterion_base_category,\n
+ membership_criterion_category=membership_criterion_category) \n
+\n
+ domain.setCriterionPropertyList(property_dict.keys())\n
+ for key, value in property_dict.items():\n
+ domain.setCriterion(key, value)\n
+\n
+ domain_list.append(domain)\n
+\n
+domain_list = []\n
+\n
+if depth > 1:\n
+ return domain_list\n
+\n
+getAvailableSubjectListCached = CachingMethod(getAvailableSubjectList, \n
+ id=\'%s_%s\' % (script.id, \'subject_list_cached\'),\n
+ cache_factory=\'erp5_ui_short\')\n
+\n
+subject_list = getAvailableSubjectListCached()\n
+\n
+for subject in subject_list:\n
+ appendTempDomain("subject_" + subject,\n
+ subject.capitalize(),\n
+ dict(subject=subject),\n
+ parent,\n
+ ("by_subject",),\n
+ ("by_subject",))\n
+\n
+\n
+return domain_list\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>depth, parent, **kw</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>ERP5Site_generateDomain</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Removed: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPageModule_generateDomain.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPageModule_generateDomain.xml?rev=44432&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPageModule_generateDomain.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPageModule_generateDomain.xml (removed)
@@ -1,137 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-"""\n
- This script generates a sections list to filter the document on UNG Docs.\n
-"""\n
-\n
-from Products.ERP5Type.Cache import CachingMethod\n
-\n
-def getAvailableSubjectList(subject_list=()):\n
- """\n
- Returns the list of available subjects for all documents\n
- located in the current container (if defined) and which\n
- already match all subjects of subject_list\n
- """\n
- subject_list = ()\n
- portal_type_list = ["Web Table", "Web Page", "Web Illustration"]\n
- kw = dict(portal_type=portal_type_list,\n
- subject="!=",)\n
- subject_len = len(subject_list)\n
- result_list = context.portal_catalog(**kw)\n
-\n
- subject_list = []\n
- for keyword_list in filter(lambda x: x not in subject_list, \n
- map(lambda r: r.subject, result_list)):\n
- for keyword in keyword_list:\n
- if keyword not in subject_list:\n
- subject_list.append(keyword)\n
-\n
- return subject_list\n
-\n
-def appendTempDomain(id, \n
- title,\n
- property_dict,\n
- parent=parent,\n
- membership_criterion_base_category=(),\n
- membership_criterion_category=()):\n
- domain = parent.generateTempDomain(id=id)\n
- domain.edit(title=title,\n
- domain_generator_method_id=script.id,\n
- membership_criterion_base_category=membership_criterion_base_category,\n
- membership_criterion_category=membership_criterion_category) \n
-\n
- domain.setCriterionPropertyList(property_dict.keys())\n
- for key, value in property_dict.items():\n
- domain.setCriterion(key, value)\n
-\n
- domain_list.append(domain)\n
-\n
-domain_list = []\n
-\n
-if depth > 1:\n
- return domain_list\n
-\n
-getAvailableSubjectListCached = CachingMethod(getAvailableSubjectList, \n
- id=\'%s_%s\' % (script.id, \'subject_list_cached\'),\n
- cache_factory=\'erp5_ui_short\')\n
-\n
-subject_list = getAvailableSubjectListCached()\n
-\n
-for subject in subject_list:\n
- appendTempDomain("subject_" + subject,\n
- subject.capitalize(),\n
- dict(subject=subject),\n
- parent,\n
- ("by_subject",),\n
- ("by_subject",))\n
-\n
-\n
-return domain_list\n
-
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>depth, parent, **kw</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>WebPageModule_generateDomain</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py?rev=44433&r1=44432&r2=44433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] Fri Mar 18 16:35:53 2011
@@ -82,7 +82,7 @@ class TestUNG(ERP5TypeTestCase):
def getTitleListToBySubjectDomain(self):
parent = self.portal.portal_domains.ung_domain.by_subject
- return [domain.getTitle() for domain in self.portal.WebPageModule_generateDomain(0, parent)]
+ return [domain.getTitle() for domain in self.portal.ERP5Site_generateDomain(0, parent)]
def testERP5Site_createNewWebDocument(self):
"""Test if the script creates the objects using Templates correctly"""
@@ -97,8 +97,8 @@ class TestUNG(ERP5TypeTestCase):
portal_type="Web Illustration",
reference="default-Web.Illustration.Reference")
- def testWebPageModule_generateDomain(self):
- """Test if script WebPageModule_generateDomain generates the list of
+ def testERP5Site_generateDomain(self):
+ """Test if script ERP5Site_generateDomain generates the list of
domains correctly"""
web_page = self.portal.web_page_module.newContent(portal_type="Web Page")
self.stepTic()
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=44433&r1=44432&r2=44433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Fri Mar 18 16:35:53 2011
@@ -1 +1 @@
-302
\ No newline at end of file
+303
\ No newline at end of file
More information about the Erp5-report
mailing list