From 1afc27e20df3b2e5509f15eafa49e3626080a2c0 Mon Sep 17 00:00:00 2001
From: zhuyue <zhu.yue@99cloud.net>
Date: Wed, 1 Sep 2021 13:47:22 +0800
Subject: [PATCH] fix: Fix for checkPolicy function change

fix for checkPolicy function chagne

Change-Id: Ic63b81538027bb1481f40d52e471b517a3ca8786
---
 .../Network/Detail/subnetActions/EditSubnet.jsx      |  2 ++
 .../containers/Network/actions/CreateNetwork.jsx     |  7 ++-----
 .../network/containers/Network/actions/Edit.jsx      | 12 +++---------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/pages/network/containers/Network/Detail/subnetActions/EditSubnet.jsx b/src/pages/network/containers/Network/Detail/subnetActions/EditSubnet.jsx
index 4fdf15a5..4a3291e9 100644
--- a/src/pages/network/containers/Network/Detail/subnetActions/EditSubnet.jsx
+++ b/src/pages/network/containers/Network/Detail/subnetActions/EditSubnet.jsx
@@ -46,6 +46,8 @@ export default class EditSubnet extends ModalAction {
     return t('Edit Subnet');
   }
 
+  static buttonText = t('Edit');
+
   get subnet() {
     return this.props.item;
   }
diff --git a/src/pages/network/containers/Network/actions/CreateNetwork.jsx b/src/pages/network/containers/Network/actions/CreateNetwork.jsx
index 37b28d3e..65999dc7 100644
--- a/src/pages/network/containers/Network/actions/CreateNetwork.jsx
+++ b/src/pages/network/containers/Network/actions/CreateNetwork.jsx
@@ -19,7 +19,7 @@ import globalNetworkStore from 'stores/neutron/network';
 import globalProjectStore from 'stores/keystone/project';
 import { isEmpty, isFunction } from 'lodash';
 import Notify from 'components/Notify';
-import checkPolicy from 'resources/policy';
+import { checkPolicyRule } from 'resources/policy';
 import globalNeutronStore from 'stores/neutron/neutron';
 import networkUtil from './networkUtil';
 
@@ -58,10 +58,7 @@ export default class CreateNetwork extends ModalAction {
   }
 
   get isSystemAdmin() {
-    return checkPolicy({
-      rules: ['skyline:system_admin'],
-      every: false,
-    });
+    return checkPolicyRule('skyline:system_admin');
   }
 
   get defaultValue() {
diff --git a/src/pages/network/containers/Network/actions/Edit.jsx b/src/pages/network/containers/Network/actions/Edit.jsx
index 3b29d925..ad9c0bb1 100644
--- a/src/pages/network/containers/Network/actions/Edit.jsx
+++ b/src/pages/network/containers/Network/actions/Edit.jsx
@@ -15,7 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalNetworkStore from 'stores/neutron/network';
-import checkPolicy, { checkPolicyRule } from 'resources/policy';
+import { checkPolicyRule } from 'resources/policy';
 import globalRootStore from 'stores/root';
 import { getYesNoList } from 'utils/index';
 
@@ -39,10 +39,7 @@ export default class Edit extends ModalAction {
 
   static allowed = (item) => {
     const rootStore = globalRootStore;
-    if (
-      !checkPolicyRule('skyline:system_admin') &&
-      item.project_id !== rootStore.user.project.id
-    ) {
+    if (!this.isSystemAdmin && item.project_id !== rootStore.user.project.id) {
       return Promise.resolve(false);
     }
     return Promise.resolve(true);
@@ -62,10 +59,7 @@ export default class Edit extends ModalAction {
   };
 
   get isSystemAdmin() {
-    return checkPolicy({
-      rules: ['skyline:system_admin'],
-      every: false,
-    });
+    return checkPolicyRule('skyline:system_admin');
   }
 
   get formItems() {