test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(用户组和权限): 服务集成和消息设置权限问题#1004965

This commit is contained in:
shiziyuan9527 2021-07-08 18:19:41 +08:00 committed by 刘瑞斌
parent dceaf7d8e0
commit ecfd7c5088
8 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/business/components/settings/organization/components/BugManageBtn.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<div style="margin-left: 120px"> <div style="margin-left: 100px">
<el-button type="primary" size="mini" :disabled="!show" @click="testConnection"> <el-button type="primary" size="mini" :disabled="!show" @click="testConnection">
{{ $t('ldap.test_connect') }} {{ $t('ldap.test_connect') }}
</el-button> </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') }} {{ $t('commons.edit') }}
</el-button> </el-button>
<el-button type="primary" v-if="showSave" size="mini" @click="save"> <el-button type="primary" v-if="showSave" size="mini" @click="save">
@ -12,7 +12,7 @@
<el-button v-if="showCancel" size="mini" @click="cancelEdit"> <el-button v-if="showCancel" size="mini" @click="cancelEdit">
{{ $t('organization.integration.cancel_edit') }} {{ $t('organization.integration.cancel_edit') }}
</el-button> </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') }} {{ $t('organization.integration.cancel_integration') }}
</el-button> </el-button>
</div> </div>
@ -35,6 +35,12 @@ export default {
default: true default: true
}, },
form: Object, form: Object,
editPermission: {
type: Array,
default() {
return [];
}
},
}, },
methods: { methods: {
testConnection() { testConnection() {

4
frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue
View File

@ -3,7 +3,7 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<h3>{{ $t('organization.message.defect_task_notification') }}</h3> <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') }} {{ $t('organization.message.create_new_notification') }}
</el-button> </el-button>
<el-popover <el-popover
@ -113,6 +113,7 @@
size="mini" size="mini"
v-show="!scope.row.isSet" v-show="!scope.row.isSet"
@click="handleEditTask(scope.$index,scope.row)" @click="handleEditTask(scope.$index,scope.row)"
v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
>{{ $t('commons.edit') }} >{{ $t('commons.edit') }}
</el-button> </el-button>
<el-button <el-button
@ -121,6 +122,7 @@
size="mini" size="mini"
v-show="!scope.row.isSet" v-show="!scope.row.isSet"
@click="deleteRowTask(scope.$index,scope.row)" @click="deleteRowTask(scope.$index,scope.row)"
v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
></el-button> ></el-button>
</template> </template>
</el-table-column> </el-table-column>

4
frontend/src/business/components/settings/organization/components/JenkinsNotification.vue
View File

@ -3,7 +3,7 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<h3>{{ $t('organization.message.jenkins_task_notification') }}</h3> <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') }} {{ $t('organization.message.create_new_notification') }}
</el-button> </el-button>
<el-popover <el-popover
@ -116,6 +116,7 @@
size="mini" size="mini"
v-if="!scope.row.isSet" v-if="!scope.row.isSet"
@click="handleEditTask(scope.$index,scope.row)" @click="handleEditTask(scope.$index,scope.row)"
v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
>{{ $t('commons.edit') }} >{{ $t('commons.edit') }}
</el-button> </el-button>
<el-button <el-button
@ -123,6 +124,7 @@
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
v-show="!scope.row.isSet" v-show="!scope.row.isSet"
v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
@click.native.prevent="deleteRowTask(scope.$index,scope.row)" @click.native.prevent="deleteRowTask(scope.$index,scope.row)"
></el-button> ></el-button>
</template> </template>

1
frontend/src/business/components/settings/organization/components/JiraSetting.vue
View File

@ -34,6 +34,7 @@
<bug-manage-btn @save="save" <bug-manage-btn @save="save"
@init="init" @init="init"
:edit-permission="['ORGANIZATION_SERVICE:READ+EDIT']"
@testConnection="testConnection" @testConnection="testConnection"
@cancelIntegration="cancelIntegration" @cancelIntegration="cancelIntegration"
@reloadPassInput="reloadPassInput" @reloadPassInput="reloadPassInput"

1
frontend/src/business/components/settings/organization/components/TapdSetting.vue
View File

@ -15,6 +15,7 @@
<bug-manage-btn @save="save" <bug-manage-btn @save="save"
@init="init" @init="init"
:edit-permission="['ORGANIZATION_SERVICE:READ+EDIT']"
@testConnection="testConnection" @testConnection="testConnection"
@cancelIntegration="cancelIntegration" @cancelIntegration="cancelIntegration"
@reloadPassInput="reloadPassInput" @reloadPassInput="reloadPassInput"

4
frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue
View File

@ -3,7 +3,7 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<h3>{{ $t('organization.message.test_plan_task_notification') }}</h3> <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') }} {{ $t('organization.message.create_new_notification') }}
</el-button> </el-button>
<el-popover <el-popover
@ -112,6 +112,7 @@
size="mini" size="mini"
v-show="!scope.row.isSet" v-show="!scope.row.isSet"
@click="handleEditTask(scope.$index,scope.row)" @click="handleEditTask(scope.$index,scope.row)"
v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
>{{ $t('commons.edit') }} >{{ $t('commons.edit') }}
</el-button> </el-button>
<el-button <el-button
@ -119,6 +120,7 @@
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
v-show="!scope.row.isSet" v-show="!scope.row.isSet"
v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
@click.native.prevent="deleteRowTask(scope.$index,scope.row)" @click.native.prevent="deleteRowTask(scope.$index,scope.row)"
></el-button> ></el-button>
</template> </template>

4
frontend/src/business/components/settings/organization/components/TestReviewNotification.vue
View File

@ -3,7 +3,7 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<h3>{{ $t('organization.message.test_review_task_notice') }}</h3> <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') }} {{ $t('organization.message.create_new_notification') }}
</el-button> </el-button>
<el-popover <el-popover
@ -113,6 +113,7 @@
size="mini" size="mini"
v-show="!scope.row.isSet" v-show="!scope.row.isSet"
@click="handleEditTask(scope.$index,scope.row)" @click="handleEditTask(scope.$index,scope.row)"
v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
>{{ $t('commons.edit') }} >{{ $t('commons.edit') }}
</el-button> </el-button>
<el-button <el-button
@ -120,6 +121,7 @@
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
v-show="!scope.row.isSet" v-show="!scope.row.isSet"
v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"
@click.native.prevent="deleteRowTask(scope.$index,scope.row)" @click.native.prevent="deleteRowTask(scope.$index,scope.row)"
></el-button> ></el-button>
</template> </template>

1
frontend/src/business/components/settings/organization/components/ZentaoSetting.vue
View File

@ -18,6 +18,7 @@
<bug-manage-btn @save="save" <bug-manage-btn @save="save"
@init="init" @init="init"
:edit-permission="['ORGANIZATION_SERVICE:READ+EDIT']"
@testConnection="testConnection" @testConnection="testConnection"
@cancelIntegration="cancelIntegration" @cancelIntegration="cancelIntegration"
@reloadPassInput="reloadPassInput" @reloadPassInput="reloadPassInput"