[Erp5-report] r41381 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: PathTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Dec 13 11:12:32 CET 2010
Author: gabriel
Date: Mon Dec 13 11:12:32 2010
New Revision: 41381
URL: http://svn.erp5.org?rev=41381&view=rev
Log:
2010-12-13 gabriel
* Remove all categories because for now all ung sections are domains only
Removed:
erp5/trunk/bt5/erp5_web_ung_theme/PathTemplateItem/portal_categories/
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPageModule_generateDomain.xml
erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log
erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
erp5/trunk/bt5/erp5_web_ung_theme/bt/template_path_list
Modified: 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=41381&r1=41380&r2=41381&view=diff
==============================================================================
--- 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 [utf8] Mon Dec 13 11:12:32 2010
@@ -56,26 +56,44 @@
"""\n
domain_list = []\n
\n
-if depth == 0:\n
- url = \'publication_section\'\n
- context.log(script.id, \'parent = %r, context = %r, url = %r, depth = %r\' % (parent, context, url, depth))\n
- domain = parent.generateTempDomain(id=\'all_document_list\')\n
- domain.edit(title=\'All Documents\',\n
- list_method=\'WebPageModule_getDocumentListFiltered\',\n
+def appendTempDomain(id, title, property_dict):\n
+ domain = parent.generateTempDomain(id=id)\n
+ domain.edit(title=title,\n
domain_generator_method_id = script.id)\n
+ domain.setCriterionPropertyList(property_dict.keys())\n
+ for key, value in property_dict.items():\n
+ domain.setCriterion(key, value)\n
domain_list.append(domain)\n
-\n
- category_list = context.portal_categories.getCategoryValue(url).contentValues()\n
- for category in category_list:\n
- domain = parent.generateTempDomain(id = category.getId())\n
- domain.edit(title = category.getTitle(),\n
- membership_criterion_base_category = (\'publication_section\',), \n
- membership_criterion_category = (category.getRelativeUrl(),),\n
- domain_generator_method_id = script.id,\n
- uid = category.getUid())\n
-\n
- domain_list.append(domain)\n
+ \n
+if depth == 0:\n
+ domain = appendTempDomain(\'all_document_list\', \n
+ \'All Documents\', \n
+ dict(validation_state=[\'draft\']))\n
\n
+ domain = appendTempDomain(\'hidden_document_list\', \n
+ \'Hidden\', \n
+ dict(validation_state=[\'hidden\']))\n
+\n
+ domain = appendTempDomain(\'opened_document_list\', \n
+ \'Opened by me\', \n
+ dict(local_roles=\'Owner\', validation_state=[\'draft\']))\n
+\n
+ domain = appendTempDomain(\'owner_document_list\', \n
+ \'Owned by me\',\n
+ dict(local_roles=\'Owner\', validation_state=[\'draft\']))\n
+\n
+ domain = appendTempDomain(\'shared_document_list\', \n
+ \'Shared by me\',\n
+ dict(validation_state=[\'draft\']))\n
+\n
+ domain = appendTempDomain(\'starred_document_list\',\n
+ \'Starred\',\n
+ dict(validation_state=[\'draft\']))\n
+\n
+ domain = appendTempDomain(\'trash_document_list\',\n
+ \'Trash\',\n
+ dict(validation_state=[\'deleted\']))\n
+\n
domain = parent.generateTempDomain(id=\'webpage_module_list\')\n
domain.edit(title=\'Document by Type\',\n
list_method=\'WebPageModule_getDocumentListFiltered\',\n
@@ -139,14 +157,11 @@ return domain_list\n
<string>parent</string>
<string>kw</string>
<string>domain_list</string>
- <string>url</string>
+ <string>appendTempDomain</string>
+ <string>dict</string>
+ <string>domain</string>
<string>_getattr_</string>
- <string>context</string>
<string>script</string>
- <string>domain</string>
- <string>category_list</string>
- <string>_getiter_</string>
- <string>category</string>
<string>webpage_subdomain</string>
<string>webtable_subdomain</string>
<string>webillustration_subdomain</string>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log?rev=41381&r1=41380&r2=41381&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] Mon Dec 13 11:12:32 2010
@@ -1,3 +1,6 @@
+2010-12-13 gabriel
+* Remove all categories because for now all ung sections are domains only
+
2010-12-10 gabriel
* Refactored code to be possible make upload of Spreadsheet Documents.
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=41381&r1=41380&r2=41381&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Mon Dec 13 11:12:32 2010
@@ -1 +1 @@
-114
\ No newline at end of file
+115
\ No newline at end of file
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/template_path_list?rev=41381&r1=41380&r2=41381&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/template_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/template_path_list [utf8] Mon Dec 13 11:12:32 2010
@@ -1,15 +1,3 @@
-portal_categories/publication_section/hidden
-portal_categories/publication_section/hidden/**
-portal_categories/publication_section/opened
-portal_categories/publication_section/opened/**
-portal_categories/publication_section/owner
-portal_categories/publication_section/owner/**
-portal_categories/publication_section/shared
-portal_categories/publication_section/shared/**
-portal_categories/publication_section/starred
-portal_categories/publication_section/starred/**
-portal_categories/publication_section/trash
-portal_categories/publication_section/trash/**
portal_domains/ung_domain
portal_domains/ung_domain/**
web_page_module/**
More information about the Erp5-report
mailing list