apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 18:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

Browse Source
This commit is contained in:
Jessica Wang 2010-10-27 17:47:29 -07:00
commit c3f96a7ed5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/vm/DomainRouterVO.java
View File

@ -35,7 +35,7 @@ import com.cloud.utils.net.NetUtils;
@PrimaryKeyJoinColumn(name="id")
@DiscriminatorValue(value="DomainRouter")
public class DomainRouterVO extends VMInstanceVO implements DomainRouter {
@Column(name="ram_size", updatable=false, nullable=false)
@Column(name="ram_size", nullable=false)
private int ramSize;
@Column(name="gateway")

8
ui/new/scripts/cloud.core2.instance.js
View File

@ -825,12 +825,12 @@ function initVMWizard() {
$("body").stopTime(timerKey);
if (result.jobstatus == 1) {
// Succeeded
vmToMidmenu(result.virtualmachine[0], $midmenuItem1);
vmToMidmenu(result.jobresult.deployvirtualmachineresponse, $midmenuItem1);
bindClickToMidMenu($midmenuItem1, vmToRightPanel, getMidmenuId);
if (result.virtualmachine[0].passwordenabled == 'true') {
var extraMessage = "New password: " + result.virtualmachine[0].password;
if (result.jobresult.deployvirtualmachineresponse.passwordenabled == 'true') {
var extraMessage = "New password: " + result.jobresult.deployvirtualmachineresponse.password;
afterAddingMidMenuItem($midmenuItem1, true, extraMessage);
var afterActionInfo = "Your instance has been successfully created. Your new password is : " + result.virtualmachine[0].password;
var afterActionInfo = "Your instance has been successfully created. Your new password is : " + result.jobresult.deployvirtualmachineresponse.password;
$midmenuItem1.data("afterActionInfo", afterActionInfo);
}
else {