[Erp5-report] r16610 - /erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/

[nobody at svn.erp5.org]

Author: jp
Date: Tue Sep 25 18:13:05 2007
New Revision: 16610

URL: http://svn.erp5.org?rev=16610&view=rev
Log:
Set the default predicate at the root and fix missing assignment.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_generateSectionFromCategory.xml

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_generateSectionFromCategory.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_generateSectionFromCategory.xml?rev=16610&r1=16609&r2=16610&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_generateSectionFromCategory.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_generateSectionFromCategory.xml Tue Sep 25 18:13:05 2007
@@ -131,6 +131,7 @@
                                         , membership_criterion_base_category = (base_category_id,)\n
                                         , membership_criterion_category      = (category_url,)\n
                                         )\n
+      new_section.updateLocalRolesOnSecurityGroups()\n
     except ConflictError:\n
       raise\n
     except:\n
@@ -142,7 +143,7 @@
     if category.getPortalType() not in (\'Category\', \'Base Category\'):\n
       category_url = \'%s/%s\' % (base_category_id, category.getRelativeUrl())\n
     else:\n
-      category.getRelativeUrl()\n
+      category_url = category.getRelativeUrl()\n
     if update_existing:\n
       new_section.edit(title       = category.getTitle()\n
                      , description = category.getDescription()\n
@@ -150,6 +151,7 @@
                      , membership_criterion_base_category = (base_category_id,)\n
                      , membership_criterion_category      = (category_url,)\n
                      )\n
+      new_section.updateLocalRolesOnSecurityGroups()\n
   # Call the function recursively\n
   if new_section is not None:\n
     # It is possible to browse objects which are not categories\n
@@ -166,6 +168,19 @@
 my_category_value = category_tool.restrictedTraverse(category)\n
 base_category_id = my_category_value.getBaseCategory().getId()\n
 createWebSectionFromCategoryValue(context, my_category_value, depth, section_id=section_id)\n
+\n
+# Update section settings\n
+if update_existing:\n
+  section_value = getattr(context, section_id)\n
+  if \'/\' in category:\n
+    category_url = category\n
+  else:\n
+    # use the base category as a category to select all\n
+    category_url = \'%s/%s\' % (category, category) \n
+  section_value.edit(membership_criterion_base_category = (base_category_id,),\n
+                     membership_criterion_category = (category_url,))\n
+  section_value.updateLocalRolesOnSecurityGroups()\n
+\n
 \n
 # Warn about failures if any\n
 if failed_list:\n
@@ -249,6 +264,9 @@
                             <string>base_category_id</string>
                             <string>createWebSectionFromCategoryValue</string>
                             <string>my_category_value</string>
+                            <string>getattr</string>
+                            <string>section_value</string>
+                            <string>category_url</string>
                             <string>dict</string>
                           </tuple>
                         </value>