extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-27 13:22:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Consider multiple rows ids when calculating row_ids, plus does comma separation

Browse Source 
and URL encoding
This commit is contained in:
Hadi Nategh 2017-09-12 14:47:08 +02:00
parent 7c11d37480
commit 3cdd77e687
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/js/etemplate/et2_extension_nextmatch_actions.js
View File

@ -48,7 +48,14 @@ function nm_action(_action, _senders, _target, _ids)
} }
} }
// row ids // row ids
var row_ids = _ids.ids.slice(0); var row_ids = "";
for (var i = 0; i < _ids.ids.length; i++)
{
var row_id = _ids.ids[i];
row_ids += (row_id.indexOf(',') >= 0 ? '"'+row_id.replace(/"/g,'""')+'"' : row_id) +
((i < _ids.ids.length - 1) ? "," : "");
}
// Translate the internal uids back to server uids // Translate the internal uids back to server uids
var idsArr = _ids.ids; var idsArr = _ids.ids;
for (var i = 0; i < idsArr.length; i++) for (var i = 0; i < idsArr.length; i++)
@ -77,13 +84,12 @@ function nm_action(_action, _senders, _target, _ids)
var url = '#'; var url = '#';
if (typeof _action.data.url != 'undefined') if (typeof _action.data.url != 'undefined')
{ {
if (_senders.length == 1 )
// Add selected IDs to url // Add selected IDs to url
url = _action.data.url.replace(/(\$|%24)id/,encodeURIComponent(ids)) url = _action.data.url.replace(/(\$|%24)id/,encodeURIComponent(ids))
// Include select all flag too // Include select all flag too
.replace(/(\$|%24)select_all/,_ids.all) .replace(/(\$|%24)select_all/,_ids.all)
// Add row_ids to url // Add row_ids to url
.replace(/(\$|%24)row_id/,row_ids); .replace(/(\$|%24)row_id/,encodeURIComponent(row_ids));
} }
var target = null; var target = null;