This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit c6cb30d1ea304e86305d2aee05b33d3f7333aa31
Merge: 0c6b8fe 6540d99
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Tue Jul 27 17:47:05 2021 +0530
Merge remote-tracking branch 'origin/4.15' into main
.../com/cloud/server/ManagementServerImpl.java | 7 ++-
ui/public/locales/en.json | 2 +-
ui/src/components/view/ListView.vue | 3 +
ui/src/components/widgets/Status.vue | 2 +
ui/src/utils/sort.js | 2 +-
ui/src/views/AutogenView.vue | 6 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 70 ++++++++++++----------
7 files changed, 55 insertions(+), 37 deletions(-)
diff --cc ui/src/components/view/ListView.vue
index b940da5,9d77750..5faa135
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@@ -230,8 -231,11 +230,11 @@@
<span v-else>{{ text }}</span>
</span>
<a slot="readonly" slot-scope="text, record">
- <status :text="record.readonly ? 'ReadOnly' : 'ReadWrite'" />
+ <status :text="record.readonly ? 'ReadOnly' : 'ReadWrite'" displayText
/>
</a>
+ <span slot="current" slot-scope="text, record">
+ <status :text="record.current ? record.current.toString() : 'false'" />
+ </span>
<span slot="created" slot-scope="text">
{{ $toLocaleDate(text) }}
</span>
diff --cc ui/src/components/widgets/Status.vue
index beffeb4,b73bec7..3be4c59
--- a/ui/src/components/widgets/Status.vue
+++ b/ui/src/components/widgets/Status.vue
@@@ -103,10 -94,9 +103,11 @@@ export default
case 'Successfully Installed':
case 'ReadWrite':
case 'True':
+ case 'true':
case 'Up':
case 'enabled':
+ case 'PowerOn':
+ case 'success':
status = 'success'
break
case 'Alert':
@@@ -116,9 -106,9 +117,10 @@@
case 'Down':
case 'Error':
case 'False':
+ case 'false':
case 'Stopped':
- case 'ReadOnly':
+ case 'PowerOff':
+ case 'failed':
status = 'error'
break
case 'Migrating':
