[cloudstack-primate] branch master updated: infra: Fix unmanage / manager cluster (#425)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git


The following commit(s) were added to refs/heads/master by this push:
     new ffae057  infra: Fix unmanage / manager cluster (#425)
ffae057 is described below

commit ffae057c928d30d931a74f25d3b733a079806b16
Author: davidjumani <dj...@gmail.com>
AuthorDate: Wed Jun 17 08:39:52 2020 +0000

    infra: Fix unmanage / manager cluster (#425)
    
    Fixes #396
    
    Co-authored-by: Rohit Yadav <ro...@shapeblue.com>
---
 src/config/section/infra/clusters.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/section/infra/clusters.js b/src/config/section/infra/clusters.js
index d2d748d..5ba3dfd 100644
--- a/src/config/section/infra/clusters.js
+++ b/src/config/section/infra/clusters.js
@@ -68,7 +68,7 @@ export default {
       message: 'message.action.manage.cluster',
       dataView: true,
       defaultArgs: { managedstate: 'Managed' },
-      show: (record) => { return record.clustertype === 'CloudManaged' && ['PrepareUnmanaged', 'Unmanaged'].includes(record.state) }
+      show: (record) => { return record.managedstate !== 'Managed' }
     },
     {
       api: 'updateCluster',
@@ -77,7 +77,7 @@ export default {
       message: 'message.action.unmanage.cluster',
       dataView: true,
       defaultArgs: { managedstate: 'Unmanaged' },
-      show: (record) => { return record.clustertype === 'CloudManaged' && record.state === 'Enabled' }
+      show: (record) => { return record.managedstate === 'Managed' }
     },
     {
       api: 'enableOutOfBandManagementForCluster',