Commit f6f4e806 authored by Roque's avatar Roque

erp5_web_project_ui: use JIO objectToSearchText in queries

parent 570bfc6d
/*jslint nomen: true, indent: 2 */ /*jslint nomen: true, indent: 2 */
/*global window, rJS, RSVP, document, ensureArray, DOMParser, XMLSerializer*/ /*global window, rJS, RSVP, document, ensureArray, DOMParser, XMLSerializer, SimpleQuery, ComplexQuery, Query*/
(function (window, rJS, RSVP, document, ensureArray, DOMParser, XMLSerializer) { (function (window, rJS, RSVP, document, ensureArray, DOMParser, XMLSerializer, SimpleQuery, ComplexQuery, Query) {
"use strict"; "use strict";
function addRedirectionToReference(href, url) { function addRedirectionToReference(href, url) {
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
oSerializer = new XMLSerializer(), oSerializer = new XMLSerializer(),
doc = parser.parseFromString(html, "text/html"), doc = parser.parseFromString(html, "text/html"),
link_list = doc.getElementsByTagName("a"); link_list = doc.getElementsByTagName("a");
for (i = 0; i < link_list.length; i++) { for (i = 0; i < link_list.length; i += 1) {
link_list[i].setAttribute('href', addRedirectionToReference(link_list[i].getAttribute('href'), url)); link_list[i].setAttribute('href', addRedirectionToReference(link_list[i].getAttribute('href'), url));
} }
return oSerializer.serializeToString(doc); return oSerializer.serializeToString(doc);
...@@ -50,7 +50,8 @@ ...@@ -50,7 +50,8 @@
if (state === "stopped" || state === "public_stopped") { if (state === "stopped" || state === "public_stopped") {
span_element.classList.add("pass"); span_element.classList.add("pass");
break; break;
} else if (state === "failed") { }
if (state === "failed") {
span_element.classList.add("fail"); span_element.classList.add("fail");
break; break;
} }
...@@ -59,14 +60,40 @@ ...@@ -59,14 +60,40 @@
} }
function getWebPageInfo(gadget, project_reference) { function getWebPageInfo(gadget, project_reference) {
var query = 'portal_type:="Web Page" AND reference:"' + project_reference + var id,
'-Home.Page" AND validation_state:"published_alive"', content,
id, content, edit_view, redirector_ulr; edit_view,
redirector_ulr,
query,
query_list = [];
query_list.push(new SimpleQuery({
key: "portal_type",
operator: "=",
type: "simple",
value: "Web Page"
}));
query_list.push(new SimpleQuery({
key: "reference",
operator: "=",
type: "simple",
value: project_reference + '-Home.Page'
}));
query_list.push(new SimpleQuery({
key: "validation_state",
operator: "=",
type: "simple",
value: "published_alive"
}));
query = new ComplexQuery({
operator: "AND",
query_list: query_list,
type: "complex"
});
return gadget.getUrlFor({command: 'push_history', options: {page: "project_redirector"}}) return gadget.getUrlFor({command: 'push_history', options: {page: "project_redirector"}})
.push(function (url) { .push(function (url) {
redirector_ulr = url; redirector_ulr = url;
return gadget.jio_allDocs({ return gadget.jio_allDocs({
query: query, query: Query.objectToSearchText(query),
limit: 1, limit: 1,
select_list: ['text_content'] select_list: ['text_content']
}); });
...@@ -78,7 +105,9 @@ ...@@ -78,7 +105,9 @@
return gadget.jio_getAttachment(id, "links") return gadget.jio_getAttachment(id, "links")
.push(function (web_page_document) { .push(function (web_page_document) {
edit_view = getActionListByName( edit_view = getActionListByName(
ensureArray(web_page_document._links.view), "view_editor"); 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};
}); });
} }
...@@ -132,7 +161,9 @@ ...@@ -132,7 +161,9 @@
}) })
.push(function (result_list) { .push(function (result_list) {
var milestone_view = getActionListByName( var milestone_view = getActionListByName(
ensureArray(result_list[1]._links.view), "milestone"), ensureArray(result_list[1]._links.view),
"milestone"
),
document_view = result_list[3] + document_view = result_list[3] +
'/ERP5Document_getHateoas?mode=traverse&relative_url=' + '/ERP5Document_getHateoas?mode=traverse&relative_url=' +
modification_dict.jio_key + '&view=Project_viewDocumentList'; modification_dict.jio_key + '&view=Project_viewDocumentList';
...@@ -211,4 +242,4 @@ ...@@ -211,4 +242,4 @@
return true; return true;
}); });
}(window, rJS, RSVP, document, ensureArray, DOMParser, XMLSerializer)); }(window, rJS, RSVP, document, ensureArray, DOMParser, XMLSerializer, SimpleQuery, ComplexQuery, Query));
\ No newline at end of file \ No newline at end of file
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