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

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

Conflicts:
	client/WEB-INF/classes/resources/messages.properties
This commit is contained in:
Brian Federle 2012-03-28 15:03:17 -07:00
parent 3e2ca5a54f 964eeeb515
commit 698a1bb3cd
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ label.management.ips=Management IP Addresses
label.devices=Devices
label.rules=Rules
label.traffic.label=Traffic label
label.vm.state=VM state
message.setup.physical.network.during.zone.creation.basic=When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.
#new labels (end) ************************************************************************************************

3
ui/index.jsp
View File

@ -2919,6 +2919,7 @@ dictionary = {
'message.action.delete.physical.network': '<fmt:message key="message.action.delete.physical.network" />',
'label.physical.network': '<fmt:message key="label.physical.network" />',
'label.devices': '<fmt:message key="label.devices" />',
'label.rules': '<fmt:message key="label.rules" />'
'label.rules': '<fmt:message key="label.rules" />',
'label.vm.state': '<fmt:message key="label.vm.state" />'
};
</script>

13
ui/scripts/storage.js
View File

@ -834,12 +834,10 @@
},
{
id: { label: 'ID' },
zonename: { label: 'label.zone' },
deviceid: { label: 'label.device.id' },
zonename: { label: 'label.zone' },
state: { label: 'label.state' },
type: { label: 'label.type' },
storagetype: { label: 'label.storage.type' },
storage: { label: 'label.storage' },
storagetype: { label: 'label.storage.type' },
size : {
label: 'Size ',
converter: function(args) {
@ -858,8 +856,11 @@
return args;
}
},
vmname: { label: 'label.vm.name' },
//vmname: { label: 'label.vm.name' },
vmdisplayname: { label: 'label.vm.display.name' },
vmstate: { label: 'label.vm.state' },
deviceid: { label: 'label.device.id' },
storage: { label: 'label.storage' },
created: { label: 'label.created', converter: cloudStack.converters.toLocalDate },
domain: { label: 'label.domain' },
account: { label: 'label.account' }
@ -1174,7 +1175,7 @@
allowedActions.push("recurringSnapshot");
}
if(jsonObj.state != "Allocated") {
if(jsonObj.vmstate == "Stopped") {
if(jsonObj.vmstate == "Stopped" || jsonObj.virtualmachineid == null) {
allowedActions.push("downloadVolume");
}
}