Author: jfthomps
Date: Wed Feb 3 17:09:51 2010
New Revision: 906127
URL: http://svn.apache.org/viewvc?rev=906127&view=rev
Log:
VCL-98
modified errorHandler:
-added check for args.dojoType being 'cancel' which means that an AJAX call was
canceled, in which case, we just return
modified AJdojoCreate:
-simplified with latest dojo so we only have to call the dojo parser
removed fixButtons2
removed initPrivTree
removed checkSelectParent
removed hidePrivileges
removed showPrivileges
removed showAddNodePane
removed showDeleteNodeDialog
removed showAddUserPane
removed showAddUserGroupPane
removed showAddResourceGroupPane
removed submitUserPrivChanges
removed submitUserGroupPrivChanges
removed submitResourceGroupPrivChanges
removed addNodePaneHide
removed submitAddResource
removed submitAddResourcePriv
moved showResStatusPane to requests.js
moved showWindow to requests.js
moved nodeSelect to privileges.js
moved refreshPerms to privileges.js
moved submitAddUser to privileges.js
moved addUserPaneHide to privileges.js
moved submitAddUserGroup to privileges.js
moved addUserGroupPaneHide to privileges.js
moved privChange to privileges.js
moved submitAddResourceGroup to privileges.js
moved addResourceGroupPaneHide to privileges.js
moved changeCascadedRights to privileges.js
moved nodeCheck to privileges.js
moved submitAddChildNode to privileges.js
moved deleteNode to privileges.js
moved addChildNode to privileges.js
moved setSelectedPrivNode to privileges.js
moved selectEnvironment to requests.js
moved updateWaitTime to requests.js
moved setMaxRequestLength to requests.js
moved resRefresh to requests.js
*** add JIRA tags
Modified:
incubator/vcl/trunk/web/js/code.js
Modified: incubator/vcl/trunk/web/js/code.js
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/js/code.js?rev=906127&r1=906126&r2=906127&view=diff
==============================================================================
--- incubator/vcl/trunk/web/js/code.js (original)
+++ incubator/vcl/trunk/web/js/code.js Wed Feb 3 17:09:51 2010
@@ -40,50 +40,6 @@
document.getElementById('testjavascript').value = '1';
}
-function fixButtons2() {
- var btns = new Array('addNodeBtn',
- 'deleteNodeBtn',
- 'userPrivBtn',
- 'addUserBtn',
- 'groupPrivBtn',
- 'addGroupBtn',
- 'resourcePrivBtn',
- 'addResourceBtn',
- 'submitAddUserBtn',
- 'cancelAddUserBtn',
- 'submitAddGroupBtn',
- 'cancelAddGroupBtn',
- 'submitAddNodeBtn',
- 'cancelAddNodeBtn',
- 'submitDeleteNodeBtn',
- 'cancelDeleteNodeBtn'
- );
- var obj;
- for(var i = 0; i < btns.length; i++) {
- obj = dojo.widget.byId(btns[i]);
- if(obj) {
- obj.domNode.style.zoom = 1;
- obj.domNode.style.zoom = "";
- }
- }
-}
-
-function initPrivTree() {
- var obj = dojo.widget.byId('privTree');
- if(obj) {
- dojo.event.topic.subscribe("nodeSelected",
- function(message) {nodeSelect(message.node);}
- );
- dojo.event.topic.subscribe(obj.eventNames['expand'],
- treeListener, 'nodeExpand');
- var selectedNodeId = dojo.io.cookie.get('VCLACTIVENODE');
- var selectedNode = dojo.widget.byId(selectedNodeId);
- setSelectedPrivNode(selectedNodeId);
- var selector = dojo.widget.byId('treeSelector');
- dojo.event.connect('before', selector, 'onCollapse',
treeListener, 'nodeCollapse');
- }
-}
-
function checkAllCompUtils() {
var count = 0;
var obj;
@@ -150,96 +106,10 @@
return false;
}
-function checkSelectParent(message) {
- var node = message.source;
- var selector = dojo.widget.byId('treeSelector');
- if(! selector.selectedNode)
- return;
- var parent = selector.selectedNode.parent;
- while(parent !== node && parent.isTreeNode) {
- parent = parent.parent;
- }
- if(parent === node)
- selector.select(message);
-}
-
-function hidePrivileges() {
- //dojo.lfx.fadeHide(dojo.byId('nodePerms'), 200).play();
-}
-
-function showPrivileges() {
- //dojo.lfx.fadeShow(dojo.byId('nodePerms'), 300).play();
-}
-
-function showAddNodePane() {
- showWindow('addNodePane');
-}
-
-function showDeleteNodeDialog() {
- dojo.widget.byId('deleteDialog').show();
-}
-
-function showAddUserPane() {
- showWindow('addUserPane');
-}
-
-function showAddUserGroupPane() {
- showWindow('addUserGroupPane');
-}
-
-function showAddResourceGroupPane() {
- showWindow('addResourceGroupPane');
-}
-
-function showResStatusPane(reqid) {
- var currdetailid = dojo.byId('detailreqid').value;
- if(! dojo.widget.byId('resStatusPane')) {
- window.location.reload();
- return;
- }
- var windowstate = dojo.widget.byId('resStatusPane').windowState;
- if(currdetailid != reqid) {
- dojo.byId('detailreqid').value = reqid;
- dojo.byId('resStatusText').innerHTML = 'Loading...';
- }
- if( windowstate == 'minimized' || currdetailid != reqid) {
- if(typeof(refresh_timer) != "undefined")
- clearTimeout(refresh_timer);
- if(windowstate == 'minimized')
- showWindow('resStatusPane');
- resRefresh();
- }
-}
-
function hideResStatusPane() {
dojo.widget.byId('resStatusPane').minimizeWindow();
}
-/*function showWindow(name, offset, leftdist) {
- var obj = dojo.widget.byId(name);
- obj[name].style.position = 'absolute';
- if(leftdist == null)
- obj[name].style.left = 30;
- else
- obj[name].style.left = leftdist;
- obj.restoreWindow();
- //var offset = dojo.byId('offset').value;
- obj[name].style.top = mouseY - offset;
-}*/
-
-function showWindow(name) {
- var x = mouseX;
- var y = mouseY;
- var obj = dojo.widget.byId(name);
- obj.domNode.style.position = 'absolute';
- obj.domNode.style.left = x + 'px';
- var newtop = y - (parseInt(obj.domNode.style.height) / 2);
- if(newtop < 0)
- newtop = 0;
- obj.domNode.style.top = newtop + 'px';
- obj.restoreWindow();
-}
-
var genericCB = function(type, data, evt) {
unsetLoading();
var regex = new RegExp('^<!DOCTYPE html');
@@ -258,6 +128,8 @@
}
var errorHandler = function(type, error, data) {
+ if(args.dojoType == 'cancel')
+ return;
alert('error occurred' + error.message + data.responseText);
}
@@ -265,379 +137,10 @@
alert('Error encountered while processing AJAX callback');
}
-function nodeSelect(node) {
- var nodeid = node.widgetId;
- var nodename = node.title;
- dojo.byId('addPaneNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
- dojo.byId('addGroupPaneNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
- dojo.byId('addResourceGroupPaneNodeName').innerHTML = 'Node: <strong>' +
nodename + '</strong>';
- dojo.byId('addChildNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
- dojo.byId('deleteNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
- setLoading();
- if(dojo.byId('activeNodeAdd'))
- dojo.byId('activeNodeAdd').value = nodeid;
- if(dojo.byId('activeNodeDel'))
- dojo.byId('activeNodeDel').value = nodeid;
- hidePrivileges();
- dojo.io.cookie.set('VCLACTIVENODE', nodeid, 365, '/', cookiedomain);
- var obj = document.getElementById('nodecont');
- var data = {continuation: obj.value,
- node: nodeid};
- RPCwrapper(data, genericCB);
-}
-
-function refreshPerms() {
- setLoading();
- var selector = dojo.widget.byId('treeSelector');
- var nodeid = selector.selectedNode.widgetId;
- dojo.widget.byId('addUserPane').minimizeWindow();
- hidePrivileges();
- var obj = document.getElementById('nodecont');
- var data = {continuation: obj.value,
- node: nodeid};
- RPCwrapper(data, genericCB);
-}
-
-function submitAddUser() {
- dojo.byId('addUserPrivStatus').innerHTML = '';
- var obj = dojo.byId('newuser');
- var userid = obj.value;
- if(! userid.length)
- return;
- var perms = new Array();
- obj = dojo.widget.byId('blockchk');
- if(obj.checked)
- perms.push('block');
- for(var i = 0; obj = dojo.widget.byId('userck0:' + i); i++) {
- if(obj.checked)
- perms.push(obj.name);
- }
- var perms2 = perms.join(':', perms);
- var selector = dojo.widget.byId('treeSelector');
- var contid = dojo.byId('addusercont').value;
- var data = {continuation: contid,
- perms: perms2,
- newuser: userid,
- activeNode: selector.selectedNode.widgetId};
- setLoading();
- RPCwrapper(data, genericCB);
-}
-
-function addUserPaneHide() {
- dojo.byId('addUserPrivStatus').innerHTML = '';
- dojo.byId('newuser').value = '';
- dojo.widget.byId('addUserPane').minimizeWindow();
- var obj = dojo.widget.byId('blockchk');
- if(obj.checked) {
- obj.checked = false;
- obj._setInfo();
- }
- for(var i = 0; obj = dojo.widget.byId('userck0:' + i); i++) {
- if(obj.checked) {
- obj.checked = false;
- obj._setInfo();
- }
- }
-}
-
-function submitAddUserGroup() {
- dojo.byId('addUserGroupPrivStatus').innerHTML = '';
- var obj = dojo.byId('newgroupid');
- var groupid = obj.value;
- if(! groupid.length)
- return;
- var perms = new Array();
- obj = dojo.widget.byId('blockgrpchk');
- if(obj.checked)
- perms.push('block');
- for(var i = 0; obj = dojo.widget.byId('usergrpck0:' + i); i++) {
- if(obj.checked)
- perms.push(obj.name);
- }
- var perms2 = perms.join(':', perms);
- var selector = dojo.widget.byId('treeSelector');
- var contid = dojo.byId('addusergroupcont').value;
- var data = {continuation: contid,
- perms: perms2,
- newgroupid: groupid,
- activeNode: selector.selectedNode.widgetId};
- setLoading();
- RPCwrapper(data, genericCB);
-}
-
-function addUserGroupPaneHide() {
- dojo.byId('addUserGroupPrivStatus').innerHTML = '';
- dojo.byId('newgroupid').value = '';
- dojo.widget.byId('addUserGroupPane').minimizeWindow();
- var obj = dojo.widget.byId('blockgrpchk');
- if(obj.checked) {
- obj.checked = false;
- obj._setInfo();
- }
- for(var i = 0; obj = dojo.widget.byId('usergrpck0:' + i); i++) {
- if(obj.checked) {
- obj.checked = false;
- obj._setInfo();
- }
- }
-}
-
-function privChange(checked, row, col, type) {
- var objname = 'ck' + row + ':' + col;
- var obj = dojo.widget.byId(objname);
- if(obj.disabled)
- return;
- var nameArr = obj.name.split('[');
- nameArr = nameArr[1].split(']');
- nameArr = nameArr[0].split(':');
- if(type == 1)
- var contid = dojo.byId('changeuserprivcont').value;
- else if(type == 2)
- var contid = dojo.byId('changeusergroupprivcont').value;
- else if(type == 3)
- var contid = dojo.byId('changeresourceprivcont').value;
- var selector = dojo.widget.byId('treeSelector');
- var data = {continuation: contid,
- activeNode: selector.selectedNode.widgetId,
- item: nameArr[0],
- priv: nameArr[1],
- value: checked};
- setLoading();
- RPCwrapper(data, genericCB);
-}
-
-function submitUserPrivChanges() {
- var allusers = dojo.byId('allusers').value;
- var selector = dojo.widget.byId('treeSelector');
- var contid = dojo.byId('changeuserprivcont').value;
- var data = {continuation: contid,
- activeNode: selector.selectedNode.widgetId,
- allusers: allusers};
- var obj;
- var name;
- var nameArr;
- obj = dojo.byId('lastUserNum');
- if(obj) {
- var lastid = obj.innerHTML;
- for(var j = 0; j <= lastid; j++) {
- obj = dojo.byId('ck' + j + ':block');
- if(obj.checked) {
- nameArr = obj.name.split('[');
- nameArr = nameArr[1].split(']');
- data["privrow[" + nameArr[0] + "]"] = 1;
- }
- for(var i = 0; obj = dojo.byId('ck' + j + ':' + i);
i++) {
- if(obj.checked) {
- nameArr = obj.name.split('[');
- nameArr = nameArr[1].split(']');
- data["privrow[" + nameArr[0] + "]"] = 1;
- }
- }
- }
- setLoading();
- RPCwrapper(data, genericCB);
- }
-}
-
-function submitUserGroupPrivChanges() {
- var allgroups = dojo.byId('allgroups').value;
- var selector = dojo.widget.byId('treeSelector');
- var contid = dojo.byId('changeusergroupprivscont').value;
- var data = {continuation: contid,
- activeNode: selector.selectedNode.widgetId,
- allgroups: allgroups};
- var obj;
- var obj2;
- var name;
- var nameArr;
- obj = dojo.byId('firstUserGroupNum');
- obj2 = dojo.byId('lastUserGroupNum');
- if(obj) {
- var firstid = obj.innerHTML;
- var lastid = obj2.innerHTML;
- for(var j = firstid; j <= lastid; j++) {
- obj = dojo.byId('ck' + j + ':block');
- if(obj.checked) {
- nameArr = obj.name.split('[');
- nameArr = nameArr[1].split(']');
- data["privrow[" + nameArr[0] + "]"] = 1;
- }
- for(var i = 0; obj = dojo.byId('ck' + j + ':' + i);
i++) {
- if(obj.checked) {
- nameArr = obj.name.split('[');
- nameArr = nameArr[1].split(']');
- data["privrow[" + nameArr[0] + "]"] = 1;
- }
- }
- }
- setLoading();
- RPCwrapper(data, genericCB);
- }
-}
-
-function submitResourceGroupPrivChanges() {
- // FIXME - this needs to be replaced by using ajax to submit changes
- // as checkboxes are clicked
-}
-
-function submitAddResourceGroup() {
- dojo.byId('addResourceGroupPrivStatus').innerHTML = '';
- var obj = dojo.byId('newresourcegroupid');
- var groupid = obj.value;
- if(! groupid.length)
- return;
- var perms = new Array();
- obj = dojo.widget.byId('blockresgrpck');
- if(obj.checked)
- perms.push('block');
- obj = dojo.widget.byId('resgrpck0:0');
- if(obj.checked)
- perms.push('cascade');
- for(var i = 1; obj = dojo.widget.byId('resgrpck0:' + i); i++) {
- if(obj.checked)
- perms.push(obj.name);
- }
- var perms2 = perms.join(':', perms);
- var selector = dojo.widget.byId('treeSelector');
- var contid = dojo.byId('addresourcegroupcont').value;
- var data = {continuation: contid,
- perms: perms2,
- newgroupid: groupid,
- activeNode: selector.selectedNode.widgetId};
- setLoading();
- RPCwrapper(data, genericCB);
-}
-
-function addResourceGroupPaneHide() {
- dojo.byId('addResourceGroupPrivStatus').innerHTML = '';
- dojo.byId('newresourcegroupid').value = '';
- dojo.widget.byId('addResourceGroupPane').minimizeWindow();
- var obj = dojo.widget.byId('blockresgrpck');
- if(obj.checked) {
- obj.checked = false;
- obj._setInfo();
- }
- for(var i = 0; obj = dojo.widget.byId('resgrpck0:' + i); i++) {
- if(obj.checked) {
- obj.checked = false;
- obj._setInfo();
- }
- }
-}
-
function AJdojoCreate(objid) {
if(dojo.byId(objid)) {
- var parseObj = new dojo.xml.Parse();
- var newObjs = parseObj.parseElement(dojo.byId(objid), null,
true);
- dojo.widget.getParser().createComponents(newObjs);
- }
-}
-
-function changeCascadedRights(checked, row, count, fromclick, type) {
- var i;
- var objname;
- var color;
- var value;
- var obj;
- var obj2;
- var namearr;
- for(i = 1; i < count; i++) {
- objname = "ck" + row + ":" + i;
- obj = dojo.widget.byId(objname);
- if(! obj)
- continue;
- if(checked) {
- value = obj.value;
- if(value != 'single') {
- objname = "cell" + row + ":" + i;
- obj2 = dojo.byId(objname);
- if(! obj2)
- continue;
- obj2.bgColor = '#FFFFFF';
- if(value == 'cascade') {
- objname = "ck" + row + ":" + i;
- obj = dojo.widget.byId(objname)
- obj.checked = false;
- obj._setInfo();
- }
- }
- }
- else {
- value = obj.value;
- if(value == 'single') {
- obj.checked = true;
- obj._setInfo();
- }
- else if(value == 'cascadesingle' || value == 'cascade')
{
- obj.checked = true;
- obj._setInfo();
- objname = "cell" + row + ":" + i;
- obj2 = dojo.byId(objname);
- if(! obj2)
- continue;
- obj2.bgColor = '#008000';
- }
- }
+ dojo.parser.parse(document.getElementById(objid));
}
- if(fromclick)
- privChange(checked, row, 'block', type);
-}
-
-function nodeCheck(checked, row, col, type) {
- var objname;
- var color;
- var obj;
- var nameArr;
- objname = "cell" + row + ":" + col;
- color = document.getElementById(objname).bgColor;
- if(color == '#008000') {
- objname = "ck" + row + ":" + col;
- obj = dojo.widget.byId(objname);
- obj.checked = true;
- obj._setInfo();
- }
- else {
- privChange(checked, row, col, type);
- }
-}
-
-function submitAddChildNode() {
- dojo.byId('addChildNodeStatus').innerHTML = '';
- var obj = dojo.byId('childNodeName');
- var newnode = obj.value;
- if(! newnode.length)
- return;
- var selector = dojo.widget.byId('treeSelector');
- var contid = dojo.byId('addchildcont').value;
- var data = {continuation: contid,
- newnode: newnode,
- activeNode: selector.selectedNode.widgetId};
- setLoading();
- RPCwrapper(data, genericCB);
-}
-
-function deleteNode() {
- var selector = dojo.widget.byId('treeSelector');
- var contid = dojo.byId('delchildcont').value;
- var data = {continuation: contid,
- activeNode: selector.selectedNode.widgetId};
- dojo.widget.byId('deleteDialog').hide();
- setLoading();
- RPCwrapper(data, genericCB);
-}
-
-function addNodePaneHide() {
- dojo.byId('addChildNodeStatus').innerHTML = '';
- dojo.byId('childNodeName').value = '';
- dojo.widget.byId('addNodePane').minimizeWindow();
-}
-
-function addChildNode(name, id) {
- var selector = dojo.widget.byId('treeSelector');
- var selectedNode = selector.selectedNode;
- var newnode = dojo.widget.createWidget("TreeNode", {title: name,
widgetId: id});
- selectedNode.addChild(newnode);
- addNodePaneHide();
}
function setLoading() {
@@ -652,30 +155,6 @@
dojo.widget.byId('workingDialog').hide();
}
-function setSelectedPrivNode(nodeid) {
- var selectedNode = dojo.widget.byId(nodeid);
- if(! selectedNode)
- selectedNode = dojo.widget.byId('3');
- selectedNode.markSelected();
- var selector = dojo.widget.byId('treeSelector');
- selector.selectedNode = selectedNode;
- var nodename = selectedNode.title;
- dojo.byId('addPaneNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
- dojo.byId('addChildNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
- dojo.byId('deleteNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
- dojo.io.cookie.set('VCLACTIVENODE', nodeid, 365, '/', cookiedomain);
-}
-
-function submitAddResource() {
- dojo.byId('addResourceMode').value = 'changeResourcePrivs';
- dojo.byId('resourceForm').submit();
-}
-
-/*function submitAddResourcePriv() {
- dojo.byId('addResourceMode').value = 'addResourcePriv';
- dojo.byId('resourceForm').submit();
-}*/
-
function toggleRowSelect(id) {
var row = document.getElementById(id);
if(toggledRows[id] && toggledRows[id] == 1) {
@@ -700,91 +179,6 @@
}
}
-function selectEnvironment() {
- var imageid = dojo.byId('imagesel').value;
- if(maxTimes[imageid])
- setMaxRequestLength(maxTimes[imageid]);
- else
- setMaxRequestLength(defaultMaxTime);
- updateWaitTime(1);
-}
-
-function updateWaitTime(cleardesc) {
- var desconly = 0;
- if(cleardesc)
- dojo.byId('imgdesc').innerHTML = '';
- dojo.byId('waittime').innerHTML = '';
- if(! dojo.byId('timenow').checked) {
- dojo.byId('waittime').className = 'hidden';
- if(dojo.byId('newsubmit'))
- dojo.byId('newsubmit').value = 'Create Reservation';
- //return;
- desconly = 1;
- }
- if(dojo.byId('openend') &&
- dojo.byId('openend').checked) {
- dojo.byId('waittime').className = 'hidden';
- dojo.byId('newsubmit').value = 'Create Reservation';
- //return;
- desconly = 1;
- }
- var imageid = dojo.byId('imagesel').value;
- if(dojo.byId('reqlength'))
- var length = dojo.byId('reqlength').value;
- else
- var length = 480;
- var contid = dojo.byId('waitcontinuation').value;
- var data = {continuation: contid,
- imageid: imageid,
- length: length,
- desconly: desconly};
- if(! desconly)
- dojo.byId('waittime').className = 'shown';
- setLoading();
- RPCwrapper(data, genericCB);
-}
-
-function setMaxRequestLength(minutes) {
- var obj = dojo.byId('reqlength');
- var i;
- var text;
- var newminutes;
- var tmp;
- for(i = obj.length - 1; i >= 0; i--) {
- if(parseInt(obj.options[i].value) > minutes)
- obj.options[i] = null;
- }
- for(i = obj.length - 1; obj.options[i].value < minutes; i++) {
- // if last option is < 60, add 1 hr
- if(parseInt(obj.options[i].value) < 60 &&
- minutes >= 60) {
- text = '1 hour';
- newminutes = 60;
- }
- // else add in 2 hr chuncks up to max
- else {
- tmp = parseInt(obj.options[i].value);
- if(tmp % 120)
- tmp = tmp - (tmp % 120);
- newminutes = tmp + 120;
- if(newminutes < minutes)
- text = (newminutes / 60) + ' hours';
- else {
- newminutes = minutes;
- tmp = newminutes - (newminutes % 60);
- if(newminutes % 60)
- if(newminutes % 60 < 10)
- text = (tmp / 60) + ':0' +
(newminutes % 60) + ' hours';
- else
- text = (tmp / 60) + ':' +
(newminutes % 60) + ' hours';
- else
- text = (tmp / 60) + ' hours';
- }
- }
- obj.options[i + 1] = new Option(text, newminutes);
- }
-}
-
function updateMouseXY(e) {
if(e) {
mouseX = e.pageX;
@@ -824,27 +218,6 @@
return curtop;
}
-function resRefresh() {
- if(! dojo.byId('resRefreshCont'))
- return;
- var contid = dojo.byId('resRefreshCont').value;
- var reqid = dojo.byId('detailreqid').value;
- if(! dojo.widget.byId('resStatusPane')) {
- window.location.reload();
- return;
- }
- if(dojo.widget.byId('resStatusPane').windowState == 'minimized') {
- var incdetails = 0;
- }
- else {
- var incdetails = 1;
- }
- var data = {continuation: contid,
- incdetails: incdetails,
- reqid: reqid};
- RPCwrapper(data, genericCB);
-}
-
function showScriptOnly() {
if(!document.styleSheets)
return;
