Author: jfthomps
Date: Mon Feb 20 18:24:25 2017
New Revision: 1783786
URL: http://svn.apache.org/viewvc?rev=1783786&view=rev
Log:
VCL-1003 - drag and drop support for moving privilege nodes
fixed problem where deleting a node and a set of children threw an error
because nodes were not necessarily deleted from lowest children up, resulting
in calling a child to be deleted after it had already been deleted due to its
parent being deleted
privileges.php: modified AJsubmitDeleteNode: changed printing call to
removeNodesFromTree to send 2 arguments - $deleteNodes and $activeNode; removed
connecting fadeOut onEnd to deleteDialog hide
privileges.js: modified removeNodesFromTree: changed to accept 2 arguments,
list of nodes to check for being an revert move parent, and node to delete
along with any children; moved call to removeNodesFromTreeCB to outside of for
loop
Modified:
vcl/trunk/web/.ht-inc/privileges.php
vcl/trunk/web/js/privileges.js
Modified: vcl/trunk/web/.ht-inc/privileges.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/privileges.php?rev=1783786&r1=1783785&r2=1783786&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/privileges.php (original)
+++ vcl/trunk/web/.ht-inc/privileges.php Mon Feb 20 18:24:25 2017
@@ -1282,10 +1282,9 @@ function AJsubmitDeleteNode() {
. "WHERE id IN ($deleteNodes)";
doQuery($query, 345);
print "setSelectedPrivNode('$parent'); ";
- print "removeNodesFromTree('$deleteNodes'); ";
+ print "removeNodesFromTree('$deleteNodes', $activeNode); ";
print "dijit.byId('deleteDialog').hide(); ";
print "var workingobj = dijit.byId('workingDialog'); ";
- print "dojo.connect(workingobj._fadeOut, 'onEnd',
dijit.byId('deleteDialog'), 'hide'); ";
}
////////////////////////////////////////////////////////////////////////////////
Modified: vcl/trunk/web/js/privileges.js
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/js/privileges.js?rev=1783786&r1=1783785&r2=1783786&view=diff
==============================================================================
--- vcl/trunk/web/js/privileges.js (original)
+++ vcl/trunk/web/js/privileges.js Mon Feb 20 18:24:25 2017
@@ -231,7 +231,7 @@ function setSelectedPrivNode(nodeid) {
RPCwrapper(data, generalPrivCB, 0);
}
-function removeNodesFromTree(idlist) {
+function removeNodesFromTree(idlist, deleteid) {
var tree = dijit.byId('privtree');
var ids = idlist.split(',');
for(var i in ids) {
@@ -240,11 +240,11 @@ function removeNodesFromTree(idlist) {
moveitem = undefined;
dijit.byId('revertMoveNodeBtn').set('disabled', true);
}
- tree.model.store.fetchItemByIdentity({
- identity: ids[i],
- onItem: removeNodesFromTreeCB
- });
}
+ tree.model.store.fetchItemByIdentity({
+ identity: deleteid,
+ onItem: removeNodesFromTreeCB
+ });
}
function removeNodesFromTreeCB(item, request) {
