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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
shiziyuan9527 2020-08-20 16:16:57 +08:00
parent 07a34181c8 c4d4284957
commit 1abd168b5c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit 97634ce3182e640371765b8d4233b80340dce0f5
Subproject commit b86032cbbda9a9e6028308aa95a887cff2192f1c

2
frontend/src/business/components/api/test/components/request/ApiDubboRequestForm.vue
View File

@ -11,7 +11,7 @@
</el-select>
</el-form-item>
<el-button :disabled="!request.enable || !scenario.enable" class="debug-button" size="small" type="primary" @click="runDebug">{{$t('load_test.save_and_run')}}</el-button>
<el-button :disabled="!request.enable || !scenario.enable || isReadOnly" class="debug-button" size="small" type="primary" @click="runDebug">{{$t('load_test.save_and_run')}}</el-button>
<el-tabs v-model="activeName">
<el-tab-pane label="Interface" name="interface">

2
frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
View File

@ -40,7 +40,7 @@
</el-switch>
</el-form-item>
<el-button :disabled="!request.enable || !scenario.enable" class="debug-button" size="small" type="primary" @click="runDebug">{{ $t('load_test.save_and_run') }}</el-button>
<el-button :disabled="!request.enable || !scenario.enable || isReadOnly" class="debug-button" size="small" type="primary" @click="runDebug">{{ $t('load_test.save_and_run') }}</el-button>
<el-tabs v-model="activeName">
<el-tab-pane :label="$t('api_test.request.parameters')" name="parameters">

2
frontend/src/business/components/track/plan/components/TestPlanList.vue
View File

@ -92,7 +92,7 @@
<ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)"
@deleteClick="handleDelete(scope.row)">
<template v-slot:middle>
<ms-table-operator-button type="success" v-if="!scope.row.reportId"
<ms-table-operator-button :isTesterPermission="true" type="success" v-if="!scope.row.reportId"
:tip="$t('test_track.plan_view.create_report')" icon="el-icon-document"
@exec="openTestReportTemplate(scope.row)"/>
<ms-table-operator-button type="success" v-if="scope.row.reportId"

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 06fc0a321a9886419be5c607ddaa6b40efb5179b
Subproject commit 7e4d80cc2b870a8cac6dbb9fe6711ab6041faf6d