From ecfd7c50880e6a7113c0469f58e21f0fcb82d905 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 8 Jul 2021 18:19:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E6=88=B7=E7=BB=84=E5=92=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90):=20=E6=9C=8D=E5=8A=A1=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E5=92=8C=E6=B6=88=E6=81=AF=E8=AE=BE=E7=BD=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98#1004965?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/components/BugManageBtn.vue         | 12 +++++++++---
 .../components/DefectTaskNotification.vue            |  4 +++-
 .../organization/components/JenkinsNotification.vue  |  4 +++-
 .../settings/organization/components/JiraSetting.vue |  1 +
 .../settings/organization/components/TapdSetting.vue |  1 +
 .../components/TestPlanTaskNotification.vue          |  4 +++-
 .../components/TestReviewNotification.vue            |  4 +++-
 .../organization/components/ZentaoSetting.vue        |  1 +
 8 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/components/BugManageBtn.vue b/frontend/src/business/components/settings/organization/components/BugManageBtn.vue
index 691bb567b9..3ded3a1c67 100644
--- a/frontend/src/business/components/settings/organization/components/BugManageBtn.vue
+++ b/frontend/src/business/components/settings/organization/components/BugManageBtn.vue
@@ -1,9 +1,9 @@
 <template>
-  <div style="margin-left: 120px">
+  <div style="margin-left: 100px">
     <el-button type="primary" size="mini" :disabled="!show" @click="testConnection">
       {{ $t('ldap.test_connect') }}
     </el-button>
-    <el-button v-if="showEdit" size="mini" @click="edit">
+    <el-button v-if="showEdit" size="mini" @click="edit" v-permission="editPermission">
       {{ $t('commons.edit') }}
     </el-button>
     <el-button type="primary" v-if="showSave" size="mini" @click="save">
@@ -12,7 +12,7 @@
     <el-button v-if="showCancel" size="mini" @click="cancelEdit">
       {{ $t('organization.integration.cancel_edit') }}
     </el-button>
-    <el-button type="info" size="mini" :disabled="!show" @click="cancelIntegration">
+    <el-button type="info" size="mini" :disabled="!show" @click="cancelIntegration" v-permission="editPermission">
       {{ $t('organization.integration.cancel_integration') }}
     </el-button>
   </div>
@@ -35,6 +35,12 @@ export default {
       default: true
     },
     form: Object,
+    editPermission: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
   },
   methods: {
     testConnection() {
diff --git a/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue b/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue
index 25b88bb723..d68a925893 100644
--- a/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="10">
         <h3>{{ $t('organization.message.defect_task_notification') }}</h3>
-        <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel">
+        <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel" v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
         </el-button>
         <el-popover
@@ -113,6 +113,7 @@
                 size="mini"
                 v-show="!scope.row.isSet"
                 @click="handleEditTask(scope.$index,scope.row)"
+                v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
               >{{ $t('commons.edit') }}
               </el-button>
               <el-button
@@ -121,6 +122,7 @@
                 size="mini"
                 v-show="!scope.row.isSet"
                 @click="deleteRowTask(scope.$index,scope.row)"
+                v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
               ></el-button>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue b/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue
index fbb0bbe211..ca7d1b81ff 100644
--- a/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="10">
         <h3>{{ $t('organization.message.jenkins_task_notification') }}</h3>
-        <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel">
+        <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel" v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
         </el-button>
         <el-popover
@@ -116,6 +116,7 @@
                 size="mini"
                 v-if="!scope.row.isSet"
                 @click="handleEditTask(scope.$index,scope.row)"
+                v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
               >{{ $t('commons.edit') }}
               </el-button>
               <el-button
@@ -123,6 +124,7 @@
                 icon="el-icon-delete"
                 size="mini"
                 v-show="!scope.row.isSet"
+                v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
                 @click.native.prevent="deleteRowTask(scope.$index,scope.row)"
               ></el-button>
             </template>
diff --git a/frontend/src/business/components/settings/organization/components/JiraSetting.vue b/frontend/src/business/components/settings/organization/components/JiraSetting.vue
index 155f658717..7ab60a16dc 100644
--- a/frontend/src/business/components/settings/organization/components/JiraSetting.vue
+++ b/frontend/src/business/components/settings/organization/components/JiraSetting.vue
@@ -34,6 +34,7 @@
 
     <bug-manage-btn @save="save"
                     @init="init"
+                    :edit-permission="['ORGANIZATION_SERVICE:READ+EDIT']"
                     @testConnection="testConnection"
                     @cancelIntegration="cancelIntegration"
                     @reloadPassInput="reloadPassInput"
diff --git a/frontend/src/business/components/settings/organization/components/TapdSetting.vue b/frontend/src/business/components/settings/organization/components/TapdSetting.vue
index 31f369b690..6f83415443 100644
--- a/frontend/src/business/components/settings/organization/components/TapdSetting.vue
+++ b/frontend/src/business/components/settings/organization/components/TapdSetting.vue
@@ -15,6 +15,7 @@
 
     <bug-manage-btn @save="save"
                     @init="init"
+                    :edit-permission="['ORGANIZATION_SERVICE:READ+EDIT']"
                     @testConnection="testConnection"
                     @cancelIntegration="cancelIntegration"
                     @reloadPassInput="reloadPassInput"
diff --git a/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue
index 848958de4d..27663e909d 100644
--- a/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="10">
         <h3>{{ $t('organization.message.test_plan_task_notification') }}</h3>
-        <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel">
+        <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel" v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
         </el-button>
         <el-popover
@@ -112,6 +112,7 @@
                 size="mini"
                 v-show="!scope.row.isSet"
                 @click="handleEditTask(scope.$index,scope.row)"
+                v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
               >{{ $t('commons.edit') }}
               </el-button>
               <el-button
@@ -119,6 +120,7 @@
                 icon="el-icon-delete"
                 size="mini"
                 v-show="!scope.row.isSet"
+                v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
                 @click.native.prevent="deleteRowTask(scope.$index,scope.row)"
               ></el-button>
             </template>
diff --git a/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue b/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue
index 6459f61df5..8e4acd54a1 100644
--- a/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="10">
         <h3>{{ $t('organization.message.test_review_task_notice') }}</h3>
-        <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel">
+        <el-button icon="el-icon-circle-plus-outline" plain size="mini" @click="handleAddTaskModel" v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']">
           {{ $t('organization.message.create_new_notification') }}
         </el-button>
         <el-popover
@@ -113,6 +113,7 @@
                 size="mini"
                 v-show="!scope.row.isSet"
                 @click="handleEditTask(scope.$index,scope.row)"
+                v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
               >{{ $t('commons.edit') }}
               </el-button>
               <el-button
@@ -120,6 +121,7 @@
                 icon="el-icon-delete"
                 size="mini"
                 v-show="!scope.row.isSet"
+                v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
                 @click.native.prevent="deleteRowTask(scope.$index,scope.row)"
               ></el-button>
             </template>
diff --git a/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue b/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue
index 0e4ea89727..120a4f4448 100644
--- a/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue
+++ b/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue
@@ -18,6 +18,7 @@
 
     <bug-manage-btn @save="save"
                     @init="init"
+                    :edit-permission="['ORGANIZATION_SERVICE:READ+EDIT']"
                     @testConnection="testConnection"
                     @cancelIntegration="cancelIntegration"
                     @reloadPassInput="reloadPassInput"