etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VM Wizard - correct warning message at step 4.

This commit is contained in:
Jessica Wang 2011-02-07 11:58:32 -08:00
parent 54236677f3
commit 87b3f4a17d
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/WEB-INF/classes/resources/messages.properties
View File

@ -17,7 +17,7 @@ label.by.domain=By Domain
label.by.account=By Account
label.by.start.date=By Start Date
label.by.end.date=By End Date
message.no.network.support.configuration.not.true=direct.attach.security.groups.enabled is not set to true. Thus, no additional network features. Please continue to step 5.
#Labels
label.account.id=Account ID

3
ui/jsp/instance.jsp
View File

@ -693,7 +693,8 @@ dictionary = {
</ol>
</div>
<div id="for_no_network_support" style="display:none">
<span id="not_available_message"><fmt:message key="message.no.network.support"/></span>
<span id="not_available_message_1" style="display:none"><fmt:message key="message.no.network.support"/></span>
<span id="not_available_message_2" style="display:none"><fmt:message key="message.no.network.support.configuration.not.true"/></span>
</div>
</div>
</div>

17
ui/scripts/cloud.core.instance.js
View File

@ -1015,16 +1015,25 @@ function initVMWizard() {
}
else { // Basic Network
$thisPopup.find("#step4").find("#for_advanced_zone").hide();
if(getDirectAttachSecurityGroupsEnabled() == "true" && $selectedVmWizardTemplate.data("hypervisor") != "VMware" ) {
if($selectedVmWizardTemplate.data("hypervisor") != "VMware" && getDirectAttachSecurityGroupsEnabled() == "true") {
$thisPopup.find("#step4").find("#for_basic_zone").show();
$thisPopup.find("#step4").find("#for_no_network_support").hide();
$thisPopup.find("#step4").find("#security_group_section").show();
$thisPopup.find("#step4").find("#not_available_message").hide();
$thisPopup.find("#step4").find("#security_group_section").show();
$thisPopup.find("#step5").find("#wizard_review_network").text("Basic Network");
}
else {
$thisPopup.find("#step4").find("#for_basic_zone").hide();
$thisPopup.find("#step4").find("#for_no_network_support").show();
$thisPopup.find("#step4").find("#for_no_network_support").show();
if($selectedVmWizardTemplate.data("hypervisor") == "VMware") {
$thisPopup.find("#step4").find("#for_no_network_support").find("#not_available_message_1").show();
$thisPopup.find("#step4").find("#for_no_network_support").find("#not_available_message_2").hide();
}
else if(getDirectAttachSecurityGroupsEnabled() != "true") {
$thisPopup.find("#step4").find("#for_no_network_support").find("#not_available_message_1").hide();
$thisPopup.find("#step4").find("#for_no_network_support").find("#not_available_message_2").show();
}
$thisPopup.find("#step5").find("#wizard_review_network").text("Basic Network");
}
}