erp5_web_project_ui: get project home page by publication section preference

- script to retrieve project related pages
- use global preference to get publication section value
- test updated

bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_getRelatedDocumentList.py

+from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery
+kw.pop('relative_url', None)
+kw.pop('follow_up_uid', None)
+portal_catalog=context.getPortalObject().portal_catalog
+follow_up_related_document_list = portal_catalog(
+           portal_type=portal_type,
+           follow_up_uid=context.getUid(), **kw)
+kw['query'] = Query(relative_url='%s/%%' % context.getRelativeUrl().replace('_', r'\_'))
+if follow_up_related_document_list:
+  kw['query'] = ComplexQuery(
+    kw['query'],
+    Query(uid=[x.getUid() for x in follow_up_related_document_list]),
+    logical_operator='or')
+return [x.getRelativeUrl() for x in portal_catalog(portal_type=portal_type, limit=limit, **kw)]

bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_getRelatedDocumentList.xml

+<?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>_params</string> </key>
+            <value> <string>portal_type= (), limit=None, **kw</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Project_getRelatedDocumentList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_viewQuickOverview/my_info_gadget_field.xml

@@ -253,7 +253,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: {"project_title":here.getTitle(), "jio_key": here.getRelativeUrl(), "project_reference": here.getReference()}</string> </value>
+            <value> <string>python: {"project_title":here.getTitle(), "jio_key": here.getRelativeUrl(), "home_page_preference": "project_home_page", "project_pages": [x.replace("web_page_module/", "") for x in here.Project_getRelatedDocumentList("Web Page")]}</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_project_info.js.js

@@ -76,6 +76,7 @@
   function createProjectQuery(project_jio_key, key_value_list) {
     var i, query_list = [], id_query_list = [], id_complex_query;
     if (project_jio_key) {
+      //relation to project or child project lines
       id_query_list.push(new SimpleQuery({
         key: "source_project__relative_url",
         operator: "",
@@ -110,61 +111,85 @@
     }));
   }
 
-  function getWebPageInfo(gadget, project_reference) {
+  function getWebPageInfo(gadget, home_page_preference, project_pages) {
     var id,
       content,
       edit_view,
       redirector_ulr,
+      i,
       query,
       query_list = [],
-      valid_state_list = ["shared_alive", "released_alive", "published_alive"];
+      id_query_list = [],
+      validation_state_query_list = [],
+      valid_state_list = ["shared_alive", "released_alive", "published_alive"],
+      web_page;
+    if (project_pages.length === 0) {
+      return {"id": id, "content": content, "edit_view": edit_view};
+    }
     query_list.push(new SimpleQuery({
       key: "portal_type",
       operator: "=",
       type: "simple",
       value: "Web Page"
     }));
+    for (i = 0; i < valid_state_list.length; i += 1) {
+      validation_state_query_list.push(new SimpleQuery({
+        key: "validation_state",
+        type: "simple",
+        operator: "=",
+        value: valid_state_list[i]
+      }));
+    }
+    query_list.push(new ComplexQuery({
+      operator: "OR",
+      query_list: validation_state_query_list,
+      type: "complex"
+    }));
+    for (i = 0; i < project_pages.length; i += 1) {
+      id_query_list.push(new SimpleQuery({
+        key: "id",
+        type: "simple",
+        operator: "=",
+        value: project_pages[i]
+      }));
+    }
+    query_list.push(new ComplexQuery({
+      operator: "OR",
+      query_list: id_query_list,
+      type: "complex"
+    }));
     query_list.push(new SimpleQuery({
-      key: "reference",
+      key: "publication_section__relative_url",
       operator: "=",
       type: "simple",
-      value: project_reference + '-Home.Page'
+      value: "publication_section/" + home_page_preference
     }));
-    query = new ComplexQuery({
+    query = Query.objectToSearchText(new ComplexQuery({
       operator: "AND",
       query_list: query_list,
       type: "complex"
-    });
+    }));
     return gadget.getUrlFor({command: 'push_history', options: {page: "project_redirector"}})
       .push(function (url) {
         redirector_ulr = url;
         return gadget.jio_allDocs({
-          query: Query.objectToSearchText(query),
-          select_list: ['validation_state', 'text_content']
+          query: query,
+          select_list: ['text_content']
         });
       })
       .push(function (result_list) {
         if (result_list.data.rows[0]) {
-          var i, state, web_page;
-          for (i = 0; i < result_list.data.rows.length; i = i + 1) {
-            state = result_list.data.rows[i].value.validation_state;
-            if (valid_state_list.includes(state)) {
-              web_page = result_list.data.rows[i];
-              break;
-            }
-          }
-          if (web_page) {
-            id = web_page.id;
-            content = parseHTMLLinks(web_page.value.text_content, redirector_ulr);
-            return gadget.jio_getAttachment(id, "links")
-              .push(function (web_page_document) {
-                edit_view = getActionListByName(
-                  ensureArray(web_page_document._links.view),
-                  "view_editor"
-                );
-                return {"id": id, "content": content, "edit_view": edit_view};
-              });
-          }
+          web_page = result_list.data.rows[0];
+          id = web_page.id;
+          content = parseHTMLLinks(web_page.value.text_content, redirector_ulr);
+          return gadget.jio_getAttachment(id, "links")
+            .push(function (web_page_document) {
+              edit_view = getActionListByName(
+                ensureArray(web_page_document._links.view),
+                "view_editor"
+              );
+              return {"id": id, "content": content, "edit_view": edit_view};
+            });
         }
         return {"id": id, "content": content, "edit_view": edit_view};
       });
@@ -196,7 +221,8 @@
       var state_dict = {
           jio_key: options.jio_key || "",
           project_title: options.project_title,
-          project_reference: options.project_reference
+          home_page_preference: options.home_page_preference,
+          project_pages: options.project_pages
         };
       return this.changeState(state_dict);
     })
@@ -208,7 +234,7 @@
       return new RSVP.Queue()
         .push(function () {
           return RSVP.all([
-            getWebPageInfo(gadget, modification_dict.project_reference),
+            getWebPageInfo(gadget, modification_dict.home_page_preference, modification_dict.project_pages),
             gadget.getDeclaredGadget("editor"),
             gadget.getSetting("hateoas_url")
           ]);

bt5/erp5_web_project_ui_test/SkinTemplateItem/portal_skins/erp5_web_project_test/ERP5Site_createTestStartedProject.py

 portal = context.getPortalObject()
+project_reference = 'test-project'
+
+module = portal.getDefaultModule('Project')
+project = module.newContent(portal_type = 'Project',
+                            reference = project_reference)
+project.validate()
 
 if home_page:
   module = portal.getDefaultModule('Web Page')
   home_page = module.newContent(portal_type = 'Web Page',
-                              reference = 'test-project-Home.Page')
+                                reference = project_reference + '-home.page',
+                                publication_section = 'project_home_page',
+                                follow_up = project.getRelativeUrl())
   home_page.publishAlive()
 
-module = portal.getDefaultModule('Project')
-project = module.newContent(portal_type = 'Project',
-                            reference = 'test-project')
-project.validate()
 print "Project Created"
 return printed