Skip to content

GitLab

Commit ea3b93fb authored by Romain Courteaud's avatar Romain Courteaud :octopus:
Browse files

[erp5_web_renderjs_ui] Rewrite relation field 

Support calling render method multiple times.
parent 7b480c8f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 608 additions and 495 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multirelationstringfield_js.js
View file @ ea3b93fb
/*jslint indent: 2, maxerr: 3, nomen: true */
/*jslint indent: 2, maxerr: 3, nomen: true, unparam: true, maxlen: 80 */
/*global window, rJS, RSVP, document */
(function (window, rJS, RSVP, document) {
"use strict";
rJS(window)
/////////////////////////////////////////////////////////////////
// ready
/////////////////////////////////////////////////////////////////
// Init local properties
.ready(function (gadget) {
gadget.props = {};
return gadget.getElement()
.push(function (element) {
gadget.props.element = element;
});
function addRelationInput(gadget, value_relative_url, value_text,
value_uid, value_portal_type, index) {
var input_gadget;
return gadget.declareGadget('gadget_erp5_relation_input.html', {
element: document.createElement("fieldset")
})
.allowPublicAcquisition("addRelationInput", function () {
var fieldset = document.createElement("fieldset"),
gadget = this,
container = gadget.props.element.querySelector('.container');
return gadget.declareGadget('gadget_erp5_relation_input.html', {
element: fieldset
})
.push(function (relation_input) {
var field_json = gadget.props.field_json,
index;
if (field_json.default.value) {
index = field_json.default.relation_item_relative_url.length;
field_json.default.relation_item_relative_url.push('');
field_json.default.value.push('');
} else {
index = field_json.relation_item_relative_url.length;
field_json.relation_item_relative_url.push('');
field_json.default.push('');
}
gadget.props.gadget_list.push(relation_input);
return relation_input.render({field_json: gadget.props.field_json}, {
index: index,
addRelationInput: true
});
})
.push(function () {
container.appendChild(fieldset);
.push(function (result) {
input_gadget = result;
return input_gadget.render({
editable: gadget.state.editable,
query: gadget.state.query,
catalog_index: gadget.state.catalog_index,
allow_jump: gadget.state.allow_jump,
// required: field_json.required,
title: gadget.state.title,
key: gadget.state.key,
view: gadget.state.view,
url: gadget.state.url,
allow_creation: gadget.state.allow_creation,
portal_types: gadget.state.portal_types,
value_relative_url: value_relative_url,
value_text: value_text,
value_uid: value_uid,
value_portal_type: value_portal_type,
relation_index: index
});
})
})
.push(function () {
gadget.element.appendChild(input_gadget.element);
});
}
rJS(window)
/////////////////////////////////////////////////////////////////
// declared methods
/////////////////////////////////////////////////////////////////
.declareMethod('render', function (options) {
var field_json = options.field_json || {},
state_dict = {
editable: field_json.editable,
query: field_json.query,
catalog_index: field_json.catalog_index,
allow_jump: field_json.allow_jump,
required: field_json.required,
title: field_json.title,
key: field_json.key,
view: field_json.view,
url: field_json.url,
allow_creation: field_json.allow_creation,
portal_types: field_json.portal_types,
relation_field_id: field_json.relation_field_id
};
if (field_json.default.hasOwnProperty('value_text_list')) {
//load non saved value
state_dict.value_relative_url_list =
JSON.stringify(field_json.default.value_relative_url_list);
state_dict.value_text_list =
JSON.stringify(field_json.default.value_text_list);
state_dict.value_uid_list =
JSON.stringify(field_json.default.value_uid_list);
state_dict.value_portal_type_list =
JSON.stringify(field_json.default.value_portal_type_list);
} else {
state_dict.value_relative_url_list =
JSON.stringify(field_json.relation_item_relative_url);
state_dict.value_text_list =
JSON.stringify(field_json.default);
state_dict.value_uid_list = JSON.stringify([]);
state_dict.value_portal_type_list = JSON.stringify([]);
}
return this.changeState(state_dict);
})
.onStateChange(function () {
var gadget = this,
i,
list = [],
fieldset,
container = gadget.props.element.querySelector('.container'),
field_json = options.field_json || {},
relation_item_relative_url;
gadget.props.field_json = field_json;
if (field_json.default.value) {
if (field_json.default.relation_item_relative_url[field_json.default.relation_item_relative_url.length - 1]) {
//return form listbox
field_json.default.value.push("");
field_json.default.relation_item_relative_url.push("");
}
relation_item_relative_url = field_json.default.relation_item_relative_url;
} else {
field_json.relation_item_relative_url.push('');
field_json.default.push('');
relation_item_relative_url = field_json.relation_item_relative_url;
queue = new RSVP.Queue(),
element = gadget.element,
value_relative_url_list =
JSON.parse(gadget.state.value_relative_url_list),
value_text_list =
JSON.parse(gadget.state.value_text_list),
value_uid_list =
JSON.parse(gadget.state.value_uid_list),
value_portal_type_list =
JSON.parse(gadget.state.value_portal_type_list);
// Always display an empty value at the end
value_relative_url_list.push("");
value_text_list.push("");
// Clear first to DOM, append after to reduce flickering/manip
while (element.firstChild) {
element.removeChild(element.firstChild);
}
for (i = 0; i < relation_item_relative_url.length; i += 1) {
fieldset = document.createElement("fieldset");
container.appendChild(fieldset);
list.push(gadget.declareGadget('gadget_erp5_relation_input.html', {
element: fieldset
}));
function enQueue() {
var argument_list = arguments;
queue
.push(function () {
return addRelationInput.apply(this, argument_list);
});
}
return new RSVP.Queue()
.push(function () {
return RSVP.all(list);
for (i = 0; i < value_relative_url_list.length; i += 1) {
enQueue(gadget, value_relative_url_list[i], value_text_list[i],
value_uid_list[i], value_portal_type_list[i], i);
}
return queue;
})
.declareAcquiredMethod("notifyChange", "notifyChange")
.allowPublicAcquisition('notifyChange', function (argument_list, scope) {
// An empty relation should be created when the last one is modified
// An empty relation should be removed
var gadget = this,
sub_gadget;
return gadget.getDeclaredGadget(scope)
.push(function (result) {
sub_gadget = result;
return sub_gadget.getContent();
})
.push(function (gadget_list) {
list = [];
gadget.props.gadget_list = gadget_list;
for (i = 0; i < gadget_list.length; i += 1) {
list.push(gadget_list[i].render(options, {
index: i,
addRelationInput: (i === gadget_list.length - 1)
}));
.push(function (result) {
var value = result.value_text;
if (sub_gadget.element === gadget.element.lastChild) {
if (value) {
return addRelationInput(gadget, '', '', undefined, undefined,
gadget.element.childNodes.length);
}
/*
} else {
if (!value) {
gadget.element.removeChild(sub_gadget.element);
}
*/
}
return RSVP.all(list);
})
.push(function () {
return gadget.notifyChange();
});
})
.declareMethod('getContent', function (options) {
var list = [],
i,
gadget = this,
length = gadget.props.gadget_list.length;
if (options.format === 'erp5') {
length -= 1;
}
for (i = 0; i < length; i += 1) {
list.push(gadget.props.gadget_list[i].getContent(options, {"type": "MultiRelationField"}));
var i,
element = this.element,
queue = new RSVP.Queue(),
final_result = {},
result_list = [],
gadget = this;
function calculateSubContent(node) {
queue
.push(function () {
var scope = node.getAttribute('data-gadget-scope');
if (scope !== null) {
return gadget.getDeclaredGadget(
node.getAttribute('data-gadget-scope')
)
.push(function (result) {
return result.getContent();
})
.push(function (result) {
result_list.push(result);
});
}
});
}
return new RSVP.Queue()
.push(function () {
return RSVP.all(list);
})
.push(function (result) {
var tmp = {},
key,
key1;
for (i = 0; i < result.length; i += 1) {
for (key in result[i]) {
if (result[i].hasOwnProperty(key)) {
if (options.format === 'erp5') {
if (tmp[key] === undefined) {
tmp[key] = [];
}
tmp[key].push(result[i][key]);
} else {
if (tmp[key] === undefined) {
tmp[key] = {};
}
for (key1 in result[i][key]) {
if (result[i][key].hasOwnProperty(key1)) {
if (tmp[key][key1] === undefined) {
tmp[key][key1] = [];
}
tmp[key][key1].push(result[i][key][key1][0]);
if (this.state.editable) {
for (i = 0; i < element.childNodes.length; i += 1) {
calculateSubContent(element.childNodes[i]);
}
return queue
.push(function () {
var result = {},
j,
k = 0,
input_result;
if (options.format === "erp5") {
result[gadget.state.key] = [];
} else {
result[gadget.state.key] = {
value_text_list: [],
value_relative_url_list: [],
value_portal_type_list: [],
value_uid_list: []
};
}
for (j = 0; j < result_list.length; j += 1) {
input_result = result_list[j];
if (options.format === "erp5") {
if (input_result.hasOwnProperty('value_text')) {
if (input_result.value_text) {
if (input_result.value_portal_type) {
result[gadget.state.relation_field_id + '_' + k] =
"_newContent_" + input_result.value_portal_type;
}
result[gadget.state.key].push(input_result.value_text);
}
}
k += 1;
} else {
result[gadget.state.key].value_text_list
.push(input_result.value_text);
result[gadget.state.key].value_relative_url_list
.push(input_result.value_relative_url);
result[gadget.state.key].value_portal_type_list
.push(input_result.value_portal_type);
result[gadget.state.key].value_uid_list.push(undefined);
}
}
}
return tmp;
});
return result;
});
}
return final_result;
});
}(window, rJS, RSVP, document));
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multirelationstringfield_js.xml
View file @ ea3b93fb
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>952.33012.29157.25361</string> </value>
<value> <string>954.57674.49472.38673</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1468331865.64</float>
<float>1477584183.47</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_html.html
View file @ ea3b93fb
......@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, user-scalable=no" />
<title>ERP5 Relationstringfield</title>
<title>ERP5 Relation Input</title>
<script src="rsvp.js" type="text/javascript"></script>
<script src="renderjs.js" type="text/javascript"></script>
<script src="jiodev.js" type="text/javascript"></script>
......@@ -18,9 +18,9 @@
</script>
<script id="relation-input-template" type="text/x-handlebars-template">
<div class="relation-input ui-input-text ui-body-inherit ui-corner-all ui-shadow-inset ui-input-has-clear ui-input-has-icon {{readonly}}">
<div class="relation-input ui-input-text ui-body-inherit ui-corner-all ui-shadow-inset ui-input-has-clear ui-input-has-icon">
<div>
<input type='search' title="{{title}}" name="{{name}}" autocomplete="off" {{{input_readonly}}} data-enhanced="true" value="{{value}}" >
<input type='search' title="{{title}}" name="{{name}}" autocomplete="off" data-enhanced="true" value="{{value}}" >
<ul class="ui-listview ui-corner-all search_ul"></ul>
</div>
<a href={{href}} tabindex="-1" class="{{class_name}}" >Jump to this document</a>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_html.xml
View file @ ea3b93fb
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>954.45675.44850.53452</string> </value>
<value> <string>954.54399.20164.63317</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1476956228.04</float>
<float>1477475951.1</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.xml
View file @ ea3b93fb
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>953.41070.65129.47718</string> </value>
<value> <string>954.57692.7289.25070</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1472800801.64</float>
<float>1477583820.22</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relationstringfield_js.js
View file @ ea3b93fb
/*jslint indent: 2, maxerr: 3, nomen: true */
/*jslint indent: 2, maxerr: 3, nomen: true, maxlen: 80 */
/*global window, rJS */
(function (window, rJS) {
"use strict";
rJS(window)
.allowPublicAcquisition("addRelationInput", function () {
return;
})
/////////////////////////////////////////////////////////////////
// declared methods
/////////////////////////////////////////////////////////////////
.declareMethod('render', function (options) {
var gadget = this,
field_json = options.field_json || {};
return this.getDeclaredGadget("relation_input")
.push(function (gadget) {
return gadget.render(options, {index: 0});
var render_options = {
editable: field_json.editable,
query: field_json.query,
catalog_index: field_json.catalog_index,
allow_jump: field_json.allow_jump,
// required: field_json.required,
title: field_json.title,
key: field_json.key,
view: field_json.view,
url: field_json.url,
allow_creation: field_json.allow_creation,
portal_types: field_json.portal_types,
value_relative_url: field_json.relation_item_relative_url[0],
relation_index: 0
};
if (field_json.default.hasOwnProperty('value_text_list')) {
//load non saved value
render_options.value_relative_url =
field_json.default.value_relative_url_list[0];
render_options.value_uid =
field_json.default.value_uid_list[0];
render_options.value_text =
field_json.default.value_text_list[0];
render_options.value_portal_type =
field_json.default.value_portal_type_list[0];
} else {
render_options.value_text = field_json.default[0] || "";
}
return gadget.render(render_options);
})
.push(function () {
return gadget.changeState({
key: options.field_json.key,
relation_field_id: options.field_json.relation_field_id
});
});
})
.declareMethod('getContent', function (options) {
var gadget = this;
return this.getDeclaredGadget("relation_input")
.push(function (gadget) {
return gadget.getContent(options);
.push(function (input_gadget) {
return input_gadget.getContent();
})
.push(function (input_result) {
var result = {};
if (!input_result.hasOwnProperty('value_text')) {
return result;
}
if (options.format === "erp5") {
if (input_result.value_portal_type) {
result[gadget.state.relation_field_id] =
"_newContent_" + input_result.value_portal_type;
}
result[gadget.state.key] = input_result.value_text;
} else {
result[gadget.state.key] = {
value_text_list: [input_result.value_text],
value_relative_url_list: [input_result.value_relative_url],
value_portal_type_list: [input_result.value_portal_type],
value_uid_list: [undefined]
};
}
return result;
});
});
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relationstringfield_js.xml
View file @ ea3b93fb
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>954.45675.44850.53452</string> </value>
<value> <string>954.57675.64427.52462</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1477037965.54</float>
<float>1477582815.99</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @ ea3b93fb
......@@ -446,7 +446,7 @@
function execHistoryPreviousCommand(gadget, previous_options, load_options) {
var history = previous_options.history,
jio_key = previous_options.jio_key,
target_index = previous_options.target_index,
relation_index = previous_options.relation_index,
field = previous_options.back_field,
queue = new RSVP.Queue(),
previous_id;
......@@ -473,9 +473,9 @@
if (results) {
results = JSON.parse(results.target.result);
if (load_options.uid) {
results[field].value[target_index] = "";
results[field].relation_item_relative_url[target_index] = load_options.jio_key;
results[field].uid = load_options.uid;
results[field].value_text_list[relation_index] = "";
results[field].value_relative_url_list[relation_index] = load_options.jio_key;
results[field].value_uid_list[relation_index] = load_options.uid;
}
gadget.props.form_content = results;
}
......@@ -491,8 +491,8 @@
return gadget.props.jio_gadget.get(history.options_id);
})
.push(function (result) {
var result_list = [result, previous_id];
var options = result_list[0].data,
var result_list = [result, previous_id],
options = result_list[0].data,
next_jio_key = options.jio_key;
delete options.jio_key;
return addNavigationHistoryAndDisplay(gadget, next_jio_key, options);
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @ ea3b93fb
......@@ -232,7 +232,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>954.47260.43395.7014</string> </value>
<value> <string>954.57620.63396.46779</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -250,7 +250,7 @@
</tuple>
<state>
<tuple>
<float>1476957907.92</float>
<float>1477580291.06</float>
<string>UTC</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