apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6852: UI - modules - remove variable drModuleIncluded.

Browse Source
This commit is contained in:
Jessica Wang 2014-06-13 15:11:05 -07:00
parent c181485ae5
commit 3acebf230c
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/scripts/cloudStack.js
View File

@ -489,9 +489,6 @@
};
}
document.title = _l('label.app.name');
// set value to global variable
drModuleIncluded = isModuleIncluded("dr");
document.title = _l('label.app.name');
});
})(cloudStack, jQuery);

4
ui/scripts/sharedFunctions.js
View File

@ -49,8 +49,6 @@ var md5HashedLogin = false;
var pageSize = 20;
//var pageSize = 1; //for testing only
var drModuleIncluded = false;
//async action
var pollAsyncJobResult = function(args) {
$.ajax({
@ -1176,7 +1174,7 @@ function listViewDataProvider(args, data, options) {
}
var addExtraPropertiesIfDrModuleIncluded = function(jsonObj, resourceType) {
if (drModuleIncluded) {
if (isModuleIncluded("dr")) {
$.ajax({
url: createURL("listResourceDetails"),
data: {

4
ui/scripts/storage.js
View File

@ -906,7 +906,7 @@
}
var volumeDrEnabled = false;
if (drModuleIncluded) {
if (isModuleIncluded("dr")) {
volumeDrEnabled = cloudStack.dr.sharedFunctions.isVolumeDrEnabled(args.context.volumes[0]);
}
@ -920,7 +920,7 @@
success: function(json) {
var instanceObjs = json.listvirtualmachinesresponse.virtualmachine;
$(instanceObjs).each(function() {
if (drModuleIncluded) {
if (isModuleIncluded("dr")) {
var vmDrEnabled = cloudStack.dr.sharedFunctions.isVmDrEnabled(this);
if (vmDrEnabled == volumeDrEnabled) {
items.push({