- Add new Domain and move the script to create temporary domains for this...

- Add new Domain and move the script to create temporary domains for this Domain, because it will create subdomains only for this domain

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42040 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_web_ung_theme/PathTemplateItem/portal_domains/ung_domain.xml

@@ -44,7 +44,9 @@
         </item>
         <item>
             <key> <string>domain_generator_method_id</string> </key>
-            <value> <string>WebPageModule_generateDomain</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +54,7 @@
         </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>28</string> </value>
+            <value> <string>30</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

bt5/erp5_web_ung_theme/PathTemplateItem/portal_domains/ung_domain/by_subject.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Domain" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+        <item>
+            <key> <string>domain_generator_method_id</string> </key>
+            <value> <string>WebPageModule_generateDomain</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>by_subject</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Domain</string> </value>
+        </item>
+        <item>
+            <key> <string>string_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>By Subject</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPageModule_generateDomain.xml

@@ -50,9 +50,10 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>"""\n
+            <value> <string encoding="cdata"><![CDATA[
+
+"""\n
   This script generates a sections list to filter the document on UNG Docs.\n
-  XXX - The generation of domains should be more dynamic because some domains is create manually.\n
 """\n
 \n
 def getAvailableSubjectList(subject_list=()):\n
@@ -93,28 +94,28 @@ def appendTempDomain(id, \n
   for key, value in property_dict.items():\n
     domain.setCriterion(key, value)\n
 \n
-  return domain\n
+  domain_list.append(domain)\n
 \n
 domain_list = []\n
-validation_state_list = [\'draft\', \'published\', \'shared\']\n
 \n
-subject_domain = appendTempDomain(\'by_subject\',\n
-                          \'By Subject\',\n
-                          dict(validation_state=validation_state_list))\n
+if depth > 1:\n
+  return domain_list\n
 \n
-domain_list.append(subject_domain)\n
+validation_state_list = [\'draft\', \'published\', \'shared\']\n
 \n
 for subject in getAvailableSubjectList():\n
   appendTempDomain("subject_" + subject,\n
                    subject.capitalize(),\n
                    dict(subject=subject),\n
-                   subject_domain,\n
+                   parent,\n
                    ("by_subject",),\n
                    ("by_subject",))\n
 \n
 \n
 return domain_list\n
-</string> </value>
+
+
+]]></string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_web_ung_theme/bt/revision

-149
\ No newline at end of file
+150
\ No newline at end of file