Commit 50fe119f authored by Georgios Dagkakis's avatar Georgios Dagkakis Committed by Nicolas Wavrant

erp5_web_renderjs_ui: Add "display_action" command to router.js

So that a declaration like:
context.getUrlFor({command: 'display_action', options: {jio_key: "document", page: "action_reference"}})
can return the URL to redirect to the given action or the document
parent 0e7e5551
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
COMMAND_RELOAD = "reload", COMMAND_RELOAD = "reload",
// Display the latest state stored for a jio document // Display the latest state stored for a jio document
COMMAND_DISPLAY_STORED_STATE = "display_stored_state", COMMAND_DISPLAY_STORED_STATE = "display_stored_state",
// Display an action on the jio document,
COMMAND_DISPLAY_ACTION = "display_action",
// Display the current jio document, but change some URL parameters // Display the current jio document, but change some URL parameters
COMMAND_CHANGE_STATE = "change", COMMAND_CHANGE_STATE = "change",
// Like change, but also store the current jio document display state // Like change, but also store the current jio document display state
...@@ -56,6 +58,7 @@ ...@@ -56,6 +58,7 @@
VALID_URL_COMMAND_DICT[COMMAND_KEEP_HISTORY_AND_DISPLAY_STATE] = null; VALID_URL_COMMAND_DICT[COMMAND_KEEP_HISTORY_AND_DISPLAY_STATE] = null;
VALID_URL_COMMAND_DICT[COMMAND_DISPLAY_STORED_STATE] = null; VALID_URL_COMMAND_DICT[COMMAND_DISPLAY_STORED_STATE] = null;
VALID_URL_COMMAND_DICT[COMMAND_CHANGE_STATE] = null; VALID_URL_COMMAND_DICT[COMMAND_CHANGE_STATE] = null;
VALID_URL_COMMAND_DICT[COMMAND_DISPLAY_ACTION] = null;
VALID_URL_COMMAND_DICT[COMMAND_STORE_AND_CHANGE_STATE] = null; VALID_URL_COMMAND_DICT[COMMAND_STORE_AND_CHANGE_STATE] = null;
VALID_URL_COMMAND_DICT[COMMAND_STORE_AND_DISPLAY_STATE] = null; VALID_URL_COMMAND_DICT[COMMAND_STORE_AND_DISPLAY_STATE] = null;
VALID_URL_COMMAND_DICT[COMMAND_INDEX_STATE] = null; VALID_URL_COMMAND_DICT[COMMAND_INDEX_STATE] = null;
...@@ -164,7 +167,32 @@ ...@@ -164,7 +167,32 @@
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// Build URL functions // Build URL functions
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
function getDisplayUrlFor(jio_key, options) {
var prefix = '?',
result,
tmp,
key;
result = "#" + PREFIX_DISPLAY + (jio_key || "");
for (key in options) {
if (options.hasOwnProperty(key) && options[key] !== undefined) {
// Don't keep empty values
tmp = options[key];
if (endsWith(key, ":json")) {
tmp = JSON.stringify(tmp);
}
result += prefix + encodeURIComponent(key) + "=" + encodeURIComponent(tmp);
prefix = '&';
}
}
return result;
}
function getCommandUrlFor(gadget, command, options) { function getCommandUrlFor(gadget, command, options) {
var result = "#" + PREFIX_COMMAND + (command || ""),
prefix = "?",
key,
tmp,
tmp_dict;
if (command === COMMAND_RAW) { if (command === COMMAND_RAW) {
return options.url; return options.url;
} }
...@@ -179,11 +207,6 @@ ...@@ -179,11 +207,6 @@
return new_url; return new_url;
}); });
} }
var result = "#" + PREFIX_COMMAND + (command || ""),
prefix = "?",
key,
tmp,
tmp_dict;
tmp_dict = gadget.props.options; tmp_dict = gadget.props.options;
for (key in tmp_dict) { for (key in tmp_dict) {
if (tmp_dict.hasOwnProperty(key) && (tmp_dict[key] !== undefined)) { if (tmp_dict.hasOwnProperty(key) && (tmp_dict[key] !== undefined)) {
...@@ -245,26 +268,6 @@ ...@@ -245,26 +268,6 @@
return hash; return hash;
} }
function getDisplayUrlFor(jio_key, options) {
var prefix = '?',
result,
tmp,
key;
result = "#" + PREFIX_DISPLAY + (jio_key || "");
for (key in options) {
if (options.hasOwnProperty(key) && options[key] !== undefined) {
// Don't keep empty values
tmp = options[key];
if (endsWith(key, ":json")) {
tmp = JSON.stringify(tmp);
}
result += prefix + encodeURIComponent(key) + "=" + encodeURIComponent(tmp);
prefix = '&';
}
}
return result;
}
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// navigation history functions // navigation history functions
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
...@@ -376,6 +379,36 @@ ...@@ -376,6 +379,36 @@
); );
} }
function execDisplayActionCommand(gadget, options) {
return gadget.jio_getAttachment(options.jio_key, 'links')
.push(function (document_view) {
var i, j, action, action_data, action_url;
for (i = 0; i < Object.keys(document_view._links).length; i = i + 1) {
action = Object.keys(document_view._links)[i];
if (document_view._links.hasOwnProperty(action)) {
if (document_view._links[action].constructor !== Array) {
document_view._links[action] = [document_view._links[action]];
}
for (j = 0; j < document_view._links[action].length; j = j + 1) {
action_data = document_view._links[action][j];
if (action_data.name === options.page) {
action_url = getDisplayUrlFor(
options.jio_key,
{
jio_key: options.jio_key,
view: action_data.href
}
);
return synchronousChangeState(action_url);
}
}
}
}
throw new Error('Action not found: ' + options.name);
});
}
function execStoreAndDisplayCommand(gadget, options) { function execStoreAndDisplayCommand(gadget, options) {
var jio_key = options.jio_key, var jio_key = options.jio_key,
storage_key = jio_key, storage_key = jio_key,
...@@ -812,6 +845,9 @@ ...@@ -812,6 +845,9 @@
if (command_options.path === COMMAND_CHANGE_STATE) { if (command_options.path === COMMAND_CHANGE_STATE) {
return execChangeCommand(previous_options, next_options, drop_options); return execChangeCommand(previous_options, next_options, drop_options);
} }
if (command_options.path === COMMAND_DISPLAY_ACTION) {
return execDisplayActionCommand(gadget, next_options);
}
if (command_options.path === COMMAND_STORE_AND_CHANGE_STATE) { if (command_options.path === COMMAND_STORE_AND_CHANGE_STATE) {
return execStoreAndChangeCommand(gadget, previous_options, next_options, drop_options); return execStoreAndChangeCommand(gadget, previous_options, next_options, drop_options);
} }
......
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>nicolas</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
......
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