This is an automated email from the ASF dual-hosted git repository. nvazquez pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit b6350be6ecbeb7441257610a58725dcd10213415 Merge: 75a2c0b d8c407d Author: nicolas <[email protected]> AuthorDate: Thu Aug 5 23:46:58 2021 -0300 Merge branch '4.15' into main ui/src/components/widgets/Status.vue | 104 +++++++++++++++++------------------ 1 file changed, 52 insertions(+), 52 deletions(-) diff --cc ui/src/components/widgets/Status.vue index 3be4c59,97028c8..61df3a5 --- a/ui/src/components/widgets/Status.vue +++ b/ui/src/components/widgets/Status.vue @@@ -44,43 -44,34 +44,43 @@@ export default getText () { if (this.displayText && this.text) { var state = this.text - switch (state) { - case 'Running': + switch (state.toLowerCase()) { + case 'running': state = this.$t('state.running') break - case 'Stopped': + case 'stopped': state = this.$t('state.stopped') break - case 'Starting': + case 'starting': state = this.$t('state.starting') break - case 'Stopping': + case 'stopping': state = this.$t('state.stopping') break - case 'Suspended': + case 'suspended': state = this.$t('state.suspended') break - case 'Pending': + case 'pending': state = this.$t('state.pending') break - case 'Migrating': + case 'migrating': state = this.$t('state.migrating') break - case 'Expunging': + case 'expunging': state = this.$t('state.expunging') break - case 'Error': + case 'error': state = this.$t('state.error') break + case 'ReadOnly': + state = this.$t('state.readonly') + break + case 'ReadWrite': + state = this.$t('state.readwrite') + break + case 'InProgress': + state = this.$t('state.inprogress') + break } return state.charAt(0).toUpperCase() + state.slice(1) } @@@ -88,50 -79,45 +88,50 @@@ }, getBadgeStatus (state) { var status = 'default' - switch (state) { - case 'Active': - case 'BackedUp': - case 'Completed': - case 'Connected': - case 'Download Complete': - case 'Enabled': - case 'Implemented': - case 'Ready': - case 'Running': - case 'Setup': - case 'Started': - case 'Successfully Installed': - case 'ReadWrite': - case 'True': - case 'true': - case 'Up': + switch (state.toLowerCase()) { + case 'active': + case 'backedup': + case 'completed': + case 'connected': + case 'download complete': case 'enabled': - case 'PowerOn': + case 'implemented': + case 'on': + case 'readwrite': + case 'ready': + case 'running': + case 'setup': + case 'started': + case 'successfully installed': + case 'true': + case 'up': + case 'success': ++ case 'poweron': status = 'success' break - case 'Alert': - case 'Declined': - case 'Disabled': - case 'Disconnected': - case 'Down': - case 'Error': - case 'False': + case 'alert': + case 'declined': + case 'disabled': + case 'disconnected': + case 'down': + case 'error': case 'false': - case 'Stopped': - case 'PowerOff': + case 'off': + case 'readonly': ++ case 'poweroff': + case 'stopped': + case 'failed': status = 'error' break - case 'Migrating': - case 'Scaling': - case 'Starting': - case 'Stopping': - case 'Upgrading': - case 'InProgress': + case 'migrating': + case 'scaling': + case 'starting': + case 'stopping': + case 'upgrading': ++ case 'inprogress': status = 'processing' break - case 'Allocated': + case 'allocated': if (this.$route.path.startsWith('/publicip')) { status = 'success' } else {
