Skip to content

erp5
erp5
Commit 89ef7b43 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

[erp5_web_renderjs_ui] Rewrite the URL navigation handling 

Stop using the patched renderJS version which forces to use a fix URL pattern (#a=b&c=d).
Instead, the URL logic was moved to the router gadget which becomes responsible to build and parse URL.

This will allow applications to support their own URL pattern (HTML5 pushState for example).

In case of the ERP5 JS UI, it provides now a stateful URL building (next URL depends on the current one).

This is used to support browser side "selection" (ie, stored query parameters), needed to support pagination from one document to another.
Example:
  * go to a module
  * filter with a search
  * click on the first document line and review it
  * click on the "next" icon, to directly see the second document without going back to the list

Stateful URL are also used to provides a "global" navigation history on the browser side.
  Example:
   * go to a module
   * click on the first document (A) and review it
   * use a jump button to go to a linked document (B) and review it
   * click on the "back" button to go back to A
   * click on the "back" button to go back to the module
Please note that this history works even if you open a new tab, as it is persistent in IndexedDB.
TODO: it will be required to clean IndexedDB from time to time to not fill it

The current URL patterns are:
  #/jio_key?a=b&c=d (used to display an ERP5 document)
  #!command?a=b&c=d (used to apply some operations on the URL)
parent 5abadc55
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 813 additions and 219 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_jio_js.xml
View file @ 89ef7b43
......@@ -99,9 +99,11 @@
</item>
<item>
<key> <string>text_content</string> </key>
<value> <string>/*global window, rJS, RSVP */\n
/*jslint indent: 2, maxerr: 3 */\n
(function (window, rJS, RSVP) {\n
<value> <string encoding="cdata"><![CDATA[
/*global window, rJS, RSVP, UriTemplate, URI */\n
/*jslint indent: 2, maxerr: 3, nomen: true */\n
(function (window, rJS, RSVP, UriTemplate, URI) {\n
"use strict";\n
\n
rJS(window)\n
......@@ -134,9 +136,44 @@
});\n
})\n
\n
.declareMethod(\'allDocs\', function () {\n
.declareMethod(\'allDocs\', function (option_dict) {\n
// throw new Error(\'do not use all docs\');\n
var storage = this.state_parameter_dict.jio_storage;\n
return storage.allDocs.apply(storage, arguments);\n
\n
if (option_dict.list_method_template === undefined) {\n
return storage.allDocs.apply(storage, arguments);\n
}\n
return storage.getAttachment(\n
// XXX Ugly hardcoded meaningless id...\n
"erp5",\n
new UriTemplate.parse(option_dict.list_method_template)\n
.expand(option_dict),\n
{format: "json"}\n
)\n
.push(function (catalog_json) {\n
var data = catalog_json._embedded.contents,\n
count = data.length,\n
k,\n
uri,\n
item,\n
result = [];\n
for (k = 0; k < count; k += 1) {\n
item = data[k];\n
uri = new URI(item._links.self.href);\n
delete item._links;\n
result.push({\n
id: uri.segment(2),\n
doc: {},\n
value: item\n
});\n
}\n
return {\n
data: {\n
rows: result,\n
total_rows: result.length\n
}\n
};\n
});\n
})\n
.declareMethod(\'getAttachment\', function (id, name) {\n
return this.state_parameter_dict.jio_storage.getAttachment(id, name, {format: "json"});\n
......@@ -145,7 +182,9 @@
return this.state_parameter_dict.jio_storage.putAttachment(id, name, JSON.stringify(json));\n
});\n
\n
}(window, rJS, RSVP));</string> </value>
}(window, rJS, RSVP, UriTemplate, URI));
]]></string> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -280,7 +319,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.54088.9321.61678</string> </value>
<value> <string>946.24288.2744.26624</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -298,7 +337,7 @@
</tuple>
<state>
<tuple>
<float>1442582911.35</float>
<float>1444640714.39</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_js.xml
View file @ 89ef7b43
......@@ -304,11 +304,6 @@
//////////////////////////////////////////\n
// Page rendering\n
//////////////////////////////////////////\n
/*\n
function redirectToDefaultPage(gadget) {\n
return gadget.pleaseRedirectMyHash(\'#\');\n
}\n
*/\n
rJS(window)\n
.ready(function (g) {\n
g.props = {};\n
......@@ -382,11 +377,12 @@
return panel_gadget.render();\n
});\n
})\n
\n
//////////////////////////////////////////\n
// Acquired method\n
//////////////////////////////////////////\n
.declareAcquiredMethod(\'pleaseRedirectMyHash\', \'pleaseRedirectMyHash\')\n
.ready(function (g) {\n
return g.getDeclaredGadget(\'router\')\n
.push(function (router_gadget) {\n
return router_gadget.start();\n
});\n
})\n
\n
//////////////////////////////////////////\n
// Allow Acquisition\n
......@@ -422,16 +418,32 @@
return translation_gadget.translate(argument_list[0]);\n
});\n
})\n
\n
.allowPublicAcquisition("redirect", function (param_list) {\n
var gadget = this;\n
return gadget.aq_pleasePublishMyState.apply(gadget, param_list)\n
.push(gadget.pleaseRedirectMyHash.bind(gadget));\n
return this.getDeclaredGadget(\'router\')\n
.push(function (router_gadget) {\n
return router_gadget.getCommandUrlFor.apply(router_gadget,\n
param_list);\n
})\n
.push(function (hash) {\n
window.location.replace(hash);\n
});\n
})\n
.allowPublicAcquisition(\'reload\', function () {\n
return location.reload();\n
})\n
.allowPublicAcquisition("getUrlParameter", function (param_list) {\n
return this.getDeclaredGadget(\'router\')\n
.push(function (router_gadget) {\n
return router_gadget.getUrlParameter.apply(router_gadget, param_list);\n
});\n
})\n
.allowPublicAcquisition("getUrlFor", function (param_list) {\n
return this.aq_pleasePublishMyState(param_list[0]);\n
return this.getDeclaredGadget(\'router\')\n
.push(function (router_gadget) {\n
return router_gadget.getCommandUrlFor.apply(router_gadget,\n
param_list);\n
});\n
})\n
\n
.allowPublicAcquisition("updateHeader", function (param_list) {\n
......@@ -475,7 +487,6 @@
}\n
}\n
if (count > 2) {\n
console.log(\'Has subheader\');\n
gadget.props.sub_header_class = "ui-has-subheader";\n
}\n
});\n
......@@ -515,8 +526,11 @@
/////////////////////////////////////////////////////////////////\n
// declared methods\n
/////////////////////////////////////////////////////////////////\n
.allowPublicAcquisition("renderApplication", function (param_list) {\n
return this.renderXXX.apply(this, param_list);\n
})\n
// Render the page\n
.declareMethod(\'render\', function (options) {\n
.declareMethod(\'renderXXX\', function (options) {\n
var gadget = this;\n
\n
gadget.props.options = options;\n
......@@ -762,7 +776,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.54027.26221.22152</string> </value>
<value> <string>946.35764.39446.32955</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -780,7 +794,7 @@
</tuple>
<state>
<tuple>
<float>1442581058.21</float>
<float>1445329252.77</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @ 89ef7b43
......@@ -136,10 +136,9 @@
// acquired method\n
//////////////////////////////////////////////\n
.declareAcquiredMethod("jio_allDocs", "jio_allDocs")\n
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")\n
.declareAcquiredMethod("translateHtml", "translateHtml")\n
.declareAcquiredMethod("getUrlFor", "getUrlFor")\n
.declareAcquiredMethod("pleasePublishMyState", "pleasePublishMyState")\n
.declareAcquiredMethod("getUrlParameter", "getUrlParameter")\n
.declareAcquiredMethod("getFieldTypeGadgetUrl", "getFieldTypeGadgetUrl")\n
//////////////////////////////////////////////\n
// initialize the gadget content\n
......@@ -155,7 +154,6 @@
i;\n
\n
gadget.props.field_json = field_json;\n
gadget.props.begin_from = parseInt(options.begin_from, 10) || 0;\n
gadget.props.extended_search = options.extended_search;\n
if (field_json.show_anchor) {\n
th = document.createElement("th");\n
......@@ -172,6 +170,14 @@
thead.appendChild(tr);\n
return new RSVP.Queue()\n
.push(function () {\n
// XXX Fix in case of multiple listboxes\n
return gadget.getUrlParameter(field_json.key + \'_begin_from\');\n
})\n
.push(function (result) {\n
if (result === undefined) {\n
result = \'0\';\n
}\n
gadget.props.begin_from = parseInt(result, 10) || 0;\n
return gadget.translateHtml(document_table.innerHTML);\n
})\n
.push(function (my_translate_html) {\n
......@@ -197,9 +203,8 @@
dataset,\n
counter,\n
i,\n
list_method_promise = function () {\n
return gadget.jio_allDocs.apply(gadget, arguments);\n
};\n
gadget_path;\n
\n
if (field_json.query === undefined) {\n
original_tfoot.textContent = "Unsupported list method: \'" + field_json.list_method + "\'";\n
return;\n
......@@ -217,51 +222,30 @@
select_list.push(field_json.column_list[i][0]);\n
}\n
\n
if (field_json.list_method_template !== undefined) {\n
list_method_promise = function (option_dict) {\n
return gadget.jio_getAttachment(\n
// XXX Ugly hardcoded meaningless id...\n
"erp5",\n
new UriTemplate.parse(field_json.list_method_template)\n
.expand(option_dict)\n
)\n
.push(function (catalog_json) {\n
var data = catalog_json._embedded.contents,\n
count = data.length,\n
k,\n
uri,\n
item,\n
result = [];\n
for (k = 0; k < count; k += 1) {\n
item = data[k];\n
uri = new URI(item._links.self.href);\n
delete item._links;\n
result.push({\n
id: uri.segment(2),\n
doc: {},\n
value: item\n
});\n
}\n
return {\n
data: {\n
rows: result,\n
total_rows: result.length\n
}\n
};\n
});\n
};\n
}\n
\n
return list_method_promise({\n
"query": new URI(field_json.query).query(true).query + query_string,\n
"limit": [begin_from, begin_from + lines + 1],\n
"select_list": select_list\n
}).push(function (result) {\n
return this.getGadgetPath()\n
.push(function (result) {\n
gadget_path = result;\n
return gadget.jio_allDocs({\n
// XXX Not jIO compatible, but until a better api is found...\n
"list_method_template": field_json.list_method_template,\n
"query": new URI(field_json.query).query(true).query + query_string,\n
"limit": [begin_from, lines + 1],\n
"select_list": select_list\n
});\n
}).push(function (result) {\n
var promise_list = [result];\n
counter = Math.min(result.data.total_rows, lines);\n
for (i = 0; i < counter; i += 1) {\n
promise_list.push(\n
gadget.getUrlFor({jio_key: result.data.rows[i].id})\n
gadget.getUrlFor({\n
command: \'index\',\n
options: {\n
jio_key: result.data.rows[i].id,\n
selection_index: begin_from + i,\n
query: new URI(field_json.query).query(true).query + query_string,\n
list_method_template: field_json.list_method_template\n
}\n
})\n
);\n
}\n
return RSVP.all(promise_list);\n
......@@ -355,20 +339,19 @@
\n
function setNext() {\n
if (dataset.data.rows.length > lines) {\n
next_param.begin_from = begin_from + lines;\n
next_param[gadget.props.field_json.key + \'_begin_from\'] = begin_from + lines;\n
}\n
}\n
\n
if (begin_from === 0) {\n
setNext();\n
} else {\n
prev_param.begin_from = begin_from - lines;\n
prev_param[gadget.props.field_json.key + \'_begin_from\'] = begin_from - lines;\n
setNext();\n
}\n
\n
return RSVP.all([\n
gadget.pleasePublishMyState(prev_param),\n
gadget.pleasePublishMyState(next_param)\n
gadget.getUrlFor({command: \'change\', options: prev_param}),\n
gadget.getUrlFor({command: \'change\', options: next_param})\n
]);\n
\n
}).push(function (url_list) {\n
......@@ -626,7 +609,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.52783.20655.48793</string> </value>
<value> <string>946.34578.58020.60808</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -644,7 +627,7 @@
</tuple>
<state>
<tuple>
<float>1442504640.91</float>
<float>1445266646.36</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multirelationstringfield_js.xml
View file @ 89ef7b43
......@@ -292,7 +292,12 @@ promiseEventListener */\n
if (field_json.allow_jump && allow_jump) {\n
return new RSVP.Queue()\n
.push(function () {\n
return gadget.getUrlFor({jio_key: field_json.relation_item_relative_url[i]});\n
return gadget.getUrlFor({\n
command: \'index\',\n
options: {\n
jio_key: field_json.relation_item_relative_url[i]\n
}\n
});\n
})\n
.push(function (my_url) {\n
a2.href = my_url;\n
......@@ -475,7 +480,12 @@ promiseEventListener */\n
props.select_uid_list[i] = element.getAttribute("name");\n
wrapper.querySelector("input").value = element.textContent;\n
clearResults(wrapper, "skip");\n
return my_gadget.getUrlFor({jio_key: jump_url});\n
return my_gadget.getUrlFor({\n
command: \'index\',\n
options: {\n
jio_key: jump_url\n
}\n
});\n
}\n
}).push(function (my_url) {\n
if (my_url !== undefined) {\n
......@@ -683,7 +693,7 @@ promiseEventListener */\n
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.52422.65165.14080</string> </value>
<value> <string>945.52745.24179.54220</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -701,7 +711,7 @@ promiseEventListener */\n
</tuple>
<state>
<tuple>
<float>1442502322.12</float>
<float>1444984956.18</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
View file @ 89ef7b43
......@@ -155,10 +155,10 @@
return new RSVP.Queue()\n
.push(function () {\n
return RSVP.all([\n
g.getUrlFor({page: "front"}),\n
g.getUrlFor({page: "history"}),\n
g.getUrlFor({page: "preference"}),\n
g.getUrlFor({page: "logout"})\n
g.getUrlFor({command: \'display\', options: {page: "front"}}),\n
g.getUrlFor({command: \'display\', options: {page: "history"}}),\n
g.getUrlFor({command: \'display\', options: {page: "preference"}}),\n
g.getUrlFor({command: \'display\', options: {page: "logout"}})\n
]);\n
})\n
.push(function (all_result) {\n
......@@ -344,7 +344,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.53861.25077.18602</string> </value>
<value> <string>946.30031.56342.5324</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -362,7 +362,7 @@
</tuple>
<state>
<tuple>
<float>1442569620.96</float>
<float>1444985342.36</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.xml
View file @ 89ef7b43
......@@ -154,8 +154,8 @@
.push(function (result) {\n
var i,\n
promise_list = [\n
gadget.getUrlFor({jio_key: options.jio_key, view: options.view, editable: options.editable}),\n
gadget.getUrlFor({jio_key: options.jio_key, view: options.view, editable: options.editable, page: "breadcrumb"})\n
gadget.getUrlFor({command: \'change\', options: {page: undefined}}),\n
gadget.getUrlFor({command: \'change\', options: {page: "breadcrumb"}})\n
];\n
erp5_document = result;\n
view_list = erp5_document._links.action_workflow || [];\n
......@@ -165,10 +165,7 @@
}\n
\n
for (i = 0; i < view_list.length; i += 1) {\n
promise_list.push(gadget.getUrlFor({\n
jio_key: options.jio_key,\n
view: view_list[i].href\n
}));\n
promise_list.push(gadget.getUrlFor({command: \'change\', options: {view: view_list[i].href, page: undefined, editable: undefined}}));\n
}\n
return RSVP.all(promise_list);\n
})\n
......@@ -340,7 +337,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.52786.43920.26777</string> </value>
<value> <string>946.30039.19211.22562</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -358,7 +355,7 @@
</tuple>
<state>
<tuple>
<float>1442504825.27</float>
<float>1444985792.56</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_breadcrumbpage_js.xml
View file @ 89ef7b43
......@@ -165,7 +165,7 @@
});\n
} else {\n
// Parent is an ERP5 document\n
return gadget.getUrlFor({jio_key: jio_key})\n
return gadget.getUrlFor({command: \'display\', options: {jio_key: jio_key}})\n
.push(function (parent_href) {\n
parent_list.unshift({\n
title: parent_link.name,\n
......@@ -182,7 +182,7 @@
});\n
}\n
\n
return gadget.getUrlFor({jio_key: options.jio_key, view: options.view, editable: options.editable})\n
return gadget.getUrlFor({command: \'change\', options: {page: undefined}})\n
.push(function (back_url) {\n
header_options.back_url = back_url;\n
return gadget.jio_getAttachment(options.jio_key, "links");\n
......@@ -343,7 +343,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.52768.52090.60757</string> </value>
<value> <string>946.30044.42475.51968</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -361,7 +361,7 @@
</tuple>
<state>
<tuple>
<float>1442504878.86</float>
<float>1444986060.46</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
View file @ 89ef7b43
......@@ -212,8 +212,8 @@
section.innerHTML = my_translation_html;\n
return RSVP.all([\n
erp5_form.render(form_options),\n
form_gadget.getUrlFor({jio_key: form_gadget.props.id}),\n
form_gadget.getUrlFor({jio_key: form_gadget.props.id, page: "breadcrumb"})\n
form_gadget.getUrlFor({command: \'change\', options: {page: undefined, view: undefined}}),\n
form_gadget.getUrlFor({command: \'change\', options: {page: "breadcrumb"}})\n
]);\n
})\n
.push(function (all_result) {\n
......@@ -265,11 +265,11 @@
var location = evt.target.getResponseHeader("X-Location");\n
if (location === undefined || location === null) {\n
// No redirection, stay on the same document\n
return form_gadget.getUrlFor({jio_key: form_gadget.props.id, view: "view"});\n
return form_gadget.getUrlFor({command: \'change\', options: {view: "view", page: undefined}});\n
}\n
return RSVP.all([\n
form_gadget.notifySubmitted(),\n
form_gadget.redirect({jio_key: new URI(location).segment(2), editable: form_gadget.props.editable})\n
form_gadget.redirect({command: \'display\', options: {jio_key: new URI(location).segment(2), editable: form_gadget.props.editable}})\n
]);\n
});\n
}\n
......@@ -420,7 +420,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.54063.48707.15940</string> </value>
<value> <string>946.30291.61878.2013</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -438,7 +438,7 @@
</tuple>
<state>
<tuple>
<float>1442581458.69</float>
<float>1445000905.46</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.xml
View file @ 89ef7b43
......@@ -122,6 +122,12 @@
\n
</head>\n
<body>\n
\n
<!-- XXX action, method, fieldset -->\n
<form class="dialog_form">\n
<button type="submit" data-i18n="Submit" class="ui-btn ui-btn-b ui-btn-inline\n
ui-icon-action ui-btn-icon-right ui-screen-hidden">Submit</button>\n
\n
<div data-gadget-url="gadget_erp5_searchfield.html"\n
data-gadget-scope="erp5_searchfield"\n
data-gadget-sandbox="public"></div>\n
......@@ -129,6 +135,8 @@
<div data-gadget-url="gadget_erp5_form.html"\n
data-gadget-scope="erp5_form"\n
data-gadget-sandbox="public"></div>\n
\n
</form>\n
\n
</body>\n
</html>
......@@ -268,7 +276,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>936.46405.53164.22289</string> </value>
<value> <string>945.61017.50891.24046</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -286,7 +294,7 @@
</tuple>
<state>
<tuple>
<float>1407339467.24</float>
<float>1442998685.54</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
View file @ 89ef7b43
......@@ -99,18 +99,41 @@
</item>
<item>
<key> <string>text_content</string> </key>
<value> <string>/*global window, rJS, RSVP */\n
<value> <string>/*global window, rJS, RSVP, loopEventListener */\n
/*jslint nomen: true, indent: 2, maxerr: 3 */\n
(function (window, rJS, RSVP) {\n
(function (window, rJS, RSVP, loopEventListener) {\n
"use strict";\n
\n
rJS(window)\n
/////////////////////////////////////////////////////////////////\n
// ready\n
/////////////////////////////////////////////////////////////////\n
// Init local properties\n
.ready(function (g) {\n
g.props = {};\n
})\n
\n
// Assign the element to a variable\n
.ready(function (g) {\n
return g.getElement()\n
.push(function (element) {\n
g.props.element = element;\n
});\n
})\n
\n
.ready(function (g) {\n
return g.getGadgetPath()\n
.push(function (path) {\n
g.props.path = path;\n
});\n
})\n
/////////////////////////////////////////////////////////////////\n
// Acquired methods\n
/////////////////////////////////////////////////////////////////\n
.declareAcquiredMethod("updateHeader", "updateHeader")\n
.declareAcquiredMethod("getUrlFor", "getUrlFor")\n
.declareAcquiredMethod("redirect", "redirect")\n
.declareAcquiredMethod("getUrlParameter", "getUrlParameter")\n
\n
/////////////////////////////////////////////////////////////////\n
// declared methods\n
......@@ -122,18 +145,21 @@
\n
form_options.erp5_document = options.erp5_document;\n
form_options.form_definition = options.form_definition;\n
// XXX not generic, fix later\n
if (options.erp5_searchfield) {\n
form_options.form_definition.extended_search = options.erp5_searchfield.extended_search;\n
search_options.extended_search = options.erp5_searchfield.extended_search;\n
}\n
form_options.view = options.view;\n
\n
return new RSVP.Queue()\n
.push(function () {\n
return gadget.getUrlParameter(\'extended_search\');\n
})\n
.push(function (extended_search) {\n
// XXX not generic, fix later\n
if (extended_search) {\n
form_options.form_definition.extended_search = extended_search;\n
search_options.extended_search = extended_search;\n
}\n
var new_content_action = options.erp5_document._links.action_object_new_content_action;\n
if (new_content_action !== undefined) {\n
new_content_action = gadget.getUrlFor({jio_key: options.jio_key, view: new_content_action.href, editable: true});\n
new_content_action = gadget.getUrlFor({command: \'change\', options: {view: new_content_action.href, editable: true}});\n
} else {\n
new_content_action = "";\n
}\n
......@@ -141,9 +167,9 @@
return RSVP.all([\n
gadget.getDeclaredGadget("erp5_searchfield"),\n
gadget.getDeclaredGadget("erp5_form"),\n
gadget.getUrlFor({jio_key: options.jio_key, view: options.view, page: "breadcrumb"}),\n
gadget.getUrlFor({command: \'change\', options: {page: "breadcrumb"}}),\n
new_content_action,\n
gadget.getUrlFor({jio_key: options.jio_key, page: "action", view: options.view})\n
gadget.getUrlFor({command: \'change\', options: {page: "action"}})\n
]);\n
})\n
.push(function (all_gadget) {\n
......@@ -164,9 +190,30 @@
]);\n
});\n
\n
})\n
\n
.declareService(function () {\n
var gadget = this;\n
\n
function formSubmit() {\n
return gadget.getDeclaredGadget("erp5_searchfield")\n
.push(function (search_gadget) {\n
return search_gadget.getContent();\n
})\n
.push(function (data) {\n
return gadget.redirect({command: \'change\', options: {extended_search: data.search, begin_from: undefined}});\n
});\n
}\n
// Listen to form submit\n
return loopEventListener(\n
gadget.props.element.querySelector(\'form\'),\n
\'submit\',\n
false,\n
formSubmit\n
);\n
});\n
\n
}(window, rJS, RSVP));</string> </value>
}(window, rJS, RSVP, loopEventListener));</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -301,7 +348,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.52360.36060.34423</string> </value>
<value> <string>946.34728.38206.10615</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -319,7 +366,7 @@
</tuple>
<state>
<tuple>
<float>1442480580.57</float>
<float>1445329431.72</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml
View file @ 89ef7b43
......@@ -99,9 +99,9 @@
</item>
<item>
<key> <string>text_content</string> </key>
<value> <string>/*global window, rJS, RSVP, loopEventListener, URI, document */\n
<value> <string>/*global window, rJS, RSVP, loopEventListener, document */\n
/*jslint nomen: true, indent: 2, maxerr: 3 */\n
(function (window, rJS, RSVP, loopEventListener, URI) {\n
(function (window, rJS, RSVP, loopEventListener) {\n
"use strict";\n
\n
rJS(window)\n
......@@ -161,19 +161,19 @@
\n
new_content_action = options.erp5_document._links.action_object_new_content_action;\n
if (new_content_action !== undefined) {\n
new_content_action = form_gadget.getUrlFor({jio_key: options.jio_key, view: new_content_action.href, editable: true});\n
new_content_action = form_gadget.getUrlFor({command: \'change\', options: {view: new_content_action.href, editable: true}});\n
} else {\n
new_content_action = "";\n
}\n
\n
return RSVP.all([\n
erp5_form.render(form_options),\n
form_gadget.getUrlFor({jio_key: options.jio_key}),\n
form_gadget.getUrlFor({jio_key: options.jio_key, page: "tab", view: options.view}),\n
form_gadget.getUrlFor({jio_key: options.jio_key, page: "action", view: options.view, editable: true}),\n
form_gadget.getUrlFor({jio_key: options.jio_key, page: "breadcrumb", view: options.view, editable: true}),\n
form_gadget.getUrlFor({command: \'change\', options: {}}),\n
form_gadget.getUrlFor({command: \'change\', options: {page: "tab"}}),\n
form_gadget.getUrlFor({command: \'change\', options: {page: "action", editable: true}}),\n
form_gadget.getUrlFor({command: \'change\', options: {page: "breadcrumb", editable: true}}),\n
new_content_action,\n
form_gadget.getUrlFor({jio_key: (new URI(options.erp5_document._links.parent.href)).segment(2)})\n
form_gadget.getUrlFor({command: \'history_previous\'})\n
]);\n
})\n
.push(function (all_result) {\n
......@@ -238,7 +238,7 @@
);\n
});\n
\n
}(window, rJS, RSVP, loopEventListener, URI));</string> </value>
}(window, rJS, RSVP, loopEventListener));</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -373,7 +373,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.52387.43932.904</string> </value>
<value> <string>946.30054.11308.16162</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -391,7 +391,7 @@
</tuple>
<state>
<tuple>
<float>1442505369.77</float>
<float>1445329477.85</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml
View file @ 89ef7b43
......@@ -101,9 +101,9 @@
<key> <string>text_content</string> </key>
<value> <string encoding="cdata"><![CDATA[
/*global window, rJS, RSVP, URI */\n
/*global window, rJS, RSVP */\n
/*jslint nomen: true, indent: 2, maxerr: 3 */\n
(function (window, rJS, RSVP, URI) {\n
(function (window, rJS, RSVP) {\n
"use strict";\n
\n
// Precompile the templates while loading the first gadget instance\n
......@@ -154,10 +154,12 @@
\n
return RSVP.all([\n
form_gadget.render(form_options),\n
gadget.getUrlFor({jio_key: options.jio_key, view: options.view, editable: true}),\n
gadget.getUrlFor({jio_key: options.jio_key, page: "action", view: options.view}),\n
gadget.getUrlFor({jio_key: options.jio_key, page: "breadcrumb", view: options.view}),\n
gadget.getUrlFor({jio_key: (new URI(options.erp5_document._links.parent.href)).segment(2)})\n
gadget.getUrlFor({command: \'change\', options: {editable: true}}),\n
gadget.getUrlFor({command: \'change\', options: {page: "action"}}),\n
gadget.getUrlFor({command: \'change\', options: {page: "breadcrumb"}}),\n
gadget.getUrlFor({command: \'history_previous\'}),\n
gadget.getUrlFor({command: \'selection_previous\'}),\n
gadget.getUrlFor({command: \'selection_next\'})\n
]);\n
})\n
.push(function (all_result) {\n
......@@ -165,8 +167,8 @@
return gadget.updateHeader({\n
jump_url: "",\n
actions_url: all_result[2],\n
previous_url: "",\n
next_url: "",\n
previous_url: all_result[5],\n
next_url: all_result[6],\n
export_url: "",\n
edit_url: all_result[1],\n
selection_url: all_result[4],\n
......@@ -176,7 +178,7 @@
});\n
});\n
\n
}(window, rJS, RSVP, URI));
}(window, rJS, RSVP));
]]></string> </value>
</item>
......@@ -313,7 +315,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.52385.13762.21094</string> </value>
<value> <string>946.35769.25581.7594</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -331,7 +333,7 @@
</tuple>
<state>
<tuple>
<float>1442481653.09</float>
<float>1445329536.24</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_frontpage_js.xml
View file @ 89ef7b43
......@@ -156,7 +156,7 @@
i;\n
for (i = 0; i < result.data.rows.length; i += 1) {\n
result_list.push(RSVP.all([\n
gadget.getUrlFor({jio_key: result.data.rows[i].id}),\n
gadget.getUrlFor({command: \'display\', options: {jio_key: result.data.rows[i].id}}),\n
result.data.rows[i].value.title || result.data.rows[i].id,\n
result.data.rows[i].value.business_application_title\n
]));\n
......@@ -369,7 +369,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.49517.32009.34013</string> </value>
<value> <string>946.4325.1841.2867</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -387,7 +387,7 @@
</tuple>
<state>
<tuple>
<float>1442308668.56</float>
<float>1445266444.15</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml
View file @ 89ef7b43
......@@ -167,16 +167,17 @@
if (options.view === view_list[i].href) {\n
matching = i;\n
}\n
promise_list.push(gadget.getUrlFor({\n
jio_key: options.jio_key,\n
promise_list.push(gadget.getUrlFor({command: \'change\', options: {\n
view: view_list[i].href,\n
editable: true\n
}));\n
editable: true,\n
page: undefined\n
}}));\n
}\n
promise_list.push(gadget.getUrlFor({\n
jio_key: options.jio_key,\n
view: "view"\n
}));\n
promise_list.push(gadget.getUrlFor({command: \'change\', options: {\n
view: "view",\n
page: undefined,\n
editable: undefined\n
}}));\n
return RSVP.all(promise_list);\n
})\n
.push(function (all_result) {\n
......@@ -213,11 +214,10 @@
cancel_url: tab_list[matching].link\n
});\n
}\n
return gadget.getUrlFor({\n
jio_key: options.jio_key,\n
return gadget.getUrlFor({command: \'change\', options: {\n
view: "view",\n
editable: true\n
})\n
}})\n
.push(function (url) {\n
return gadget.updateHeader({cancel_url: url});\n
});\n
......@@ -362,7 +362,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.52770.44221.26572</string> </value>
<value> <string>946.30248.23538.25292</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -380,7 +380,7 @@
</tuple>
<state>
<tuple>
<float>1442504976.31</float>
<float>1444998449.41</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relationstringfield_js.xml
View file @ 89ef7b43
......@@ -279,7 +279,12 @@ promiseEventListener */\n
if (target_url && field_json.allow_jump) {\n
return new RSVP.Queue()\n
.push(function () {\n
return my_gadget.getUrlFor({jio_key: target_url});\n
return my_gadget.getUrlFor({\n
command: \'index\',\n
options: {\n
jio_key: target_url\n
}\n
});\n
})\n
.push(function (my_url) {\n
var plane = props.plane;\n
......@@ -759,7 +764,7 @@ promiseEventListener */\n
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.52421.57221.18466</string> </value>
<value> <string>945.64113.53120.10205</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -777,7 +782,7 @@ promiseEventListener */\n
</tuple>
<state>
<tuple>
<float>1442502350.67</float>
<float>1444727907.98</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_html.xml
View file @ 89ef7b43
......@@ -128,6 +128,7 @@
\n
</head>\n
<body>\n
<div data-gadget-url="gadget_jio.html" data-gadget-scope="jio_selection"></div>\n
</body>\n
</html>\n
......@@ -267,7 +268,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>945.43744.60869.2304</string> </value>
<value> <string>945.59812.18070.18176</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -285,7 +286,7 @@
</tuple>
<state>
<tuple>
<float>1442582305.38</float>
<float>1442926344.74</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_searchfield_html.xml
View file @ 89ef7b43
......@@ -137,7 +137,7 @@
\n
</head>\n
<body>\n
<form class="save_form document_form"></form>\n
<div class="save_form document_form"></div>\n
</body>\n
</html>
......@@ -262,7 +262,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>super_sven</string> </value>
<value> <string>romain</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -276,7 +276,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>939.54156.55991.39765</string> </value>
<value> <string>945.50880.23560.7150</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -294,7 +294,7 @@
</tuple>
<state>
<tuple>
<float>1419427478.55</float>
<float>1442998364.27</float>
<string>GMT</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_searchfield_js.xml
View file @ 89ef7b43
......@@ -135,8 +135,6 @@
// acquired method\n
//////////////////////////////////////////////\n
.declareAcquiredMethod("translateHtml", "translateHtml")\n
.declareAcquiredMethod("pleasePublishMyState", "pleasePublishMyState")\n
.declareAcquiredMethod("pleaseRedirectMyHash", "pleaseRedirectMyHash")\n
\n
/////////////////////////////////////////////////////////////////\n
// declared methods\n
......@@ -163,44 +161,18 @@
}));\n
})\n
.push(function (my_translated_html) {\n
search_gadget.props.element.querySelector("form").innerHTML =\n
search_gadget.props.element.querySelector("div").innerHTML =\n
my_translated_html;\n
return search_gadget;\n
});\n
})\n
\n
.declareMethod(\'getContent\', function () {\n
var input = this.__element.querySelector(\'input\'),\n
var input = this.props.element.querySelector(\'input\'),\n
result = {};\n
\n
result[input.getAttribute(\'name\')] = input.value;\n
return result;\n
})\n
\n
.declareService(function () {\n
var search_form = this;\n
\n
function formSubmit() {\n
return new RSVP.Queue()\n
.push(function () {\n
return search_form.getContent();\n
})\n
.push(function (data) {\n
return search_form.pleasePublishMyState({\n
"extended_search": data.search\n
});\n
})\n
.push(function (url) {\n
return search_form.pleaseRedirectMyHash(url);\n
});\n
}\n
// Listen to form submit\n
return loopEventListener(\n
search_form.props.element.querySelector(\'form\'),\n
\'submit\',\n
false,\n
formSubmit\n
);\n
});\n
\n
}(window, rJS, RSVP, loopEventListener, Handlebars));</string> </value>
......@@ -324,7 +296,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
<value> <string>romain</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -338,7 +310,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>940.11553.26313.55261</string> </value>
<value> <string>945.61050.10650.48093</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -356,7 +328,7 @@
</tuple>
<state>
<tuple>
<float>1421080302.1</float>
<float>1445265843.55</float>
<string>GMT</string>
</tuple>
</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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7