Commit 43dc43ad authored by Roque's avatar Roque

erp5_web_project_ui: fix forum link query

parent 31b1a325
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
gadget.renderProjectDocumentInfo(); gadget.renderProjectDocumentInfo();
gadget.renderOutdatedDocumentInfo(); gadget.renderOutdatedDocumentInfo();
gadget.renderTestResultInfo(gadget.state.project_list); gadget.renderTestResultInfo(gadget.state.project_list);
gadget.renderProjectForumLink(gadget.state.project_list); gadget.renderProjectForumLink();
}); });
}) })
...@@ -463,10 +463,9 @@ ...@@ -463,10 +463,9 @@
}); });
}) })
.declareJob("renderProjectForumLink", function (project_list) { .declareJob("renderProjectForumLink", function () {
var gadget = this, var gadget = this,
i, i,
forum_link,
forum_link_html, forum_link_html,
forum_link_list, forum_link_list,
link_query = getComplexQuery({"portal_type" : "Link", link_query = getComplexQuery({"portal_type" : "Link",
...@@ -475,33 +474,29 @@ ...@@ -475,33 +474,29 @@
"AND"); "AND");
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
console.log("getting links");
return gadget.jio_allDocs({ return gadget.jio_allDocs({
query: Query.objectToSearchText(link_query), query: Query.objectToSearchText(link_query),
limit: QUERY_LIMIT, limit: QUERY_LIMIT,
//select_list: ['title', 'portal_type', 'parent__relative_url', "url_string"], // TODO FIX not found column url_string when group by parent
//select_list: ['title', 'portal_type', 'parent__relative_url', 'count(*)'], select_list: ['title', 'portal_type'],//, 'url_string'],
select_list: ['title', 'url_string'],
group_by: ['parent_uid'], group_by: ['parent_uid'],
sort_on: [["modification_date", "descending"]] sort_on: [["modification_date", "descending"]]
}); });
}) })
.push(function (result) { .push(function (result) {
forum_link_list = result.data.rows; forum_link_list = result.data.rows;
console.log(forum_link_list); for (i = 0; i < forum_link_list.length; i += 1) {
/*for (i = 0; i < forum_link_list.length; i += 1) { forum_link_html = document.querySelector(
forum_link = forum_link_list[0]; getProjectHtlmElementId(getProjectId(forum_link_list[i].id),
if (forum_link && forum_link.value.parent__relative_url === project_list[i].id) { FORUM_LINK_TYPE,
forum_link_html = document.querySelector( FORUM_LINK_ID_SUFFIX, true)
getProjectHtlmElementId(forum_link.value.parent__relative_url, );
FORUM_LINK_TYPE, if (forum_link_html) {
FORUM_LINK_ID_SUFFIX, true) forum_link_html.href = forum_link_list[i].value.url_string;
); forum_link_html.innerHTML = forum_link_list[i].value.title;
forum_link_html.href = forum_link.value.url_string;
forum_link_html.innerHTML = forum_link.value.title;
forum_link_html.classList.remove("ui-hidden"); forum_link_html.classList.remove("ui-hidden");
} }
}*/ }
}); });
}) })
......
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>982.19860.15245.4198</string> </value> <value> <string>982.19902.51210.17083</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1583340780.84</float> <float>1583343312.59</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment