| |
|
Line 457
|
Parallel
|
Line 457
|
Parallel
|
| 457 |
|
457 |
|
| 458 |
if(thisForm.resourceFormId_locationDetails1.checked) |
458 |
if(thisForm.resourceFormId_locationDetails1.checked) |
| 459 |
{ |
459 |
{ |
| 460 |
getAddressValue(thisForm, successResourceAdd, "/topology/addResource.action", "Add"); |
460 |
getLatLngValue(thisForm, successResourceAdd, "/topology/addResource.action", "Add"); |
| 461 |
} |
461 |
} |
| 462 |
else |
462 |
else |
| 463 |
{ |
463 |
{ |
| 464 |
getLatLngValue(thisForm, successResourceAdd, "/topology/addResource.action", "Add"); |
464 |
getAddressValue(thisForm, successResourceAdd, "/topology/addResource.action", "Add"); |
| 465 |
} |
465 |
} |
| 466 |
} |
466 |
} |
| 467 |
else if (thisForm.operationType.value == "EDIT") |
467 |
else if (thisForm.operationType.value == "EDIT") |
| |
| |
|
Line 609
|
Parallel
|
Line 609
|
Parallel
|
| 609 |
var point=copyOfPoint; |
609 |
var point=copyOfPoint; |
| 610 |
copyOfPoint=null; |
610 |
copyOfPoint=null; |
| 611 |
progressWindow.closeProgressWindow(); |
611 |
progressWindow.closeProgressWindow(); |
| 612 |
closeEditGroupWindow(); |
612 |
|
| 613 |
if (response.responseText) |
613 |
if (response.responseText) |
| 614 |
{ |
614 |
{ |
| 615 |
var errorJson = eval('(' + response.responseText + ')'); |
615 |
var errorJson = eval('(' + response.responseText + ')'); |
| |
| |
|
Line 623
|
Parallel
|
Line 623
|
Parallel
|
| 623 |
{ |
623 |
{ |
| 624 |
updateGroupLocationDetails(TopologyManager.topologyTree.getTree().getRootNode(), errorJson); |
624 |
updateGroupLocationDetails(TopologyManager.topologyTree.getTree().getRootNode(), errorJson); |
| 625 |
TopologyManager.topologyGoogleMapControl.setCenter(point,errorJson.zoom); |
625 |
TopologyManager.topologyGoogleMapControl.setCenter(point,errorJson.zoom); |
|
|
626 |
closeEditGroupWindow(); |
| 626 |
}, 5); |
627 |
}, 5); |
| 627 |
} |
628 |
} |
| 628 |
} |
629 |
} |
| |
| |
|
Line 911
|
Parallel
|
Line 912
|
Parallel
|
| 911 |
deleteGroup = function(paramNode) |
912 |
deleteGroup = function(paramNode) |
| 912 |
{ |
913 |
{ |
| 913 |
|
914 |
|
|
|
915 |
|
| 914 |
var groupId = null; |
916 |
var groupId = null; |
| 915 |
groupId = TopologyManager.topologyTree.getEntityId(paramNode); |
917 |
groupId = TopologyManager.topologyTree.getEntityId(paramNode); |
| 916 |
JSDialog.showConfirmDialog(resourcegroupLocale.getText("resourceGroup.dialog.message.subgroupDeletedWantToContinue", [paramNode.getNodeText()]), |
918 |
JSDialog.showConfirmDialog(resourcegroupLocale.getText("resourceGroup.dialog.message.subgroupDeletedWantToContinue", [paramNode.getNodeText()]), |
| 917 |
{ |
919 |
{ |
| 918 |
onOk : function() |
920 |
onOk : function() |
| 919 |
{ |
921 |
{ |
|
|
922 |
var deleteGroupProgressWindow = JSDialog.showProgressDialog(resourcegroupLocale.getText("resourceGroup.dialog.message.deletingGroup")); |
| 920 |
var parentNode = paramNode.getParentNode(); |
923 |
var parentNode = paramNode.getParentNode(); |
| 921 |
new Ajax.Request('/topology/deleteGroup.action?groupId=' + groupId, |
924 |
new Ajax.Request('/topology/deleteGroup.action?groupId=' + groupId, |
| 922 |
{ |
925 |
{ |
| |
| |
|
Line 936
|
Parallel
|
Line 939
|
Parallel
|
| 936 |
} |
939 |
} |
| 937 |
if (responseJSON.error != null) |
940 |
if (responseJSON.error != null) |
| 938 |
JSDialog.showAlertDialog(resourcegroupLocale.getText("resourceGroup.dialog.message.cannotDeleteGroup", [paramNode.getNodeText()])); |
941 |
JSDialog.showAlertDialog(resourcegroupLocale.getText("resourceGroup.dialog.message.cannotDeleteGroup", [paramNode.getNodeText()])); |
|
|
942 |
|
| 939 |
} |
943 |
} |
| 940 |
catch (e) |
944 |
catch (e) |
| 941 |
{ |
945 |
{ |
| 942 |
} |
946 |
} |
|
|
947 |
deleteGroupProgressWindow.close(); |
| 943 |
} |
948 |
} |
| 944 |
}); |
949 |
}); |
|
|
950 |
|
|
|
951 |
|
| 945 |
return true; |
952 |
return true; |
| 946 |
} |
953 |
} |
| 947 |
}); |
954 |
}); |
| 948 |
|
|
|
| 949 |
return false; |
955 |
return false; |
| 950 |
}; |
956 |
}; |
| 951 |
var editResourceWindow = null; |
957 |
var editResourceWindow = null; |
| |
| |
|
Line 1035
|
Parallel
|
Line 1041
|
Parallel
|
| 1035 |
} |
1041 |
} |
| 1036 |
if (responseJSON.error != null) |
1042 |
if (responseJSON.error != null) |
| 1037 |
{ |
1043 |
{ |
| 1038 |
JSDialog.showAlertDialog(resourceLocale.getText("resource.dialog.message.cannotDeleteResource",[responseJSON.error])); |
1044 |
JSDialog.showAlertDialog(resourceLocale.getText("resource.dialog.message.cannotDeleteResource")); |
| 1039 |
} |
1045 |
} |
| 1040 |
} |
1046 |
} |
| 1041 |
catch (e) |
1047 |
catch (e) |
| |