Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/common/constants/permission_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def get_workspace_role(self):
Operate.TRIGGER_CREATE.value: _('Create Trigger'),
Operate.TRIGGER_EDIT.value: _('Edit Trigger'),
Operate.TRIGGER_DELETE.value: _('Delete Trigger'),
Operate.RECORD.value: _('Execute record'),
Operate.RECORD.value: _('Read execute record'),

Group.APPLICATION_OVERVIEW.value: _('Overview'),
Group.APPLICATION_ACCESS.value: _('Application Access'),
Expand Down
2 changes: 1 addition & 1 deletion apps/locales/en_US/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -9125,7 +9125,7 @@ msgstr ""
msgid "Delete Trigger"
msgstr ""

msgid "Execute record"
msgid "Read execute record"
msgstr ""

msgid "ADMIN"
Expand Down
4 changes: 2 additions & 2 deletions apps/locales/zh_CN/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -9248,8 +9248,8 @@ msgstr "编辑触发器"
msgid "Delete Trigger"
msgstr "删除触发器"

msgid "Execute record"
msgstr "执行记录"
msgid "Read execute record"
msgstr "查看执行记录"

msgid "ADMIN"
msgstr "系统管理员"
Expand Down
4 changes: 2 additions & 2 deletions apps/locales/zh_Hant/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -9245,8 +9245,8 @@ msgstr "編輯觸發器"
msgid "Delete Trigger"
msgstr "刪除觸發器"

msgid "Execute record"
msgstr "執行記錄"
msgid "Read execute record"
msgstr "檢視執行記錄"

msgid "ADMIN"
msgstr "系統管理員"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,13 @@
<AppIcon iconName="app-export" class="color-secondary"></AppIcon>
{{ $t('common.export') }}
</el-dropdown-item>
<el-dropdown-item
@click.stop="openTriggerDrawer(row)"
v-if="row.is_publish && permissionPrecise.trigger_read()"
>
<AppIcon iconName="app-trigger" class="color-secondary"></AppIcon>
{{ $t('views.trigger.title') }}
</el-dropdown-item>
<el-dropdown-item
@click.stop="deleteApplication(row)"
v-if="permissionPrecise.delete()"
Expand All @@ -302,6 +309,10 @@
:type="SourceTypeEnum.APPLICATION"
ref="ResourceAuthorizationDrawerRef"
/>
<ResourceTriggerDrawer
ref="resourceTriggerDrawerRef"
:source="SourceTypeEnum.APPLICATION"
></ResourceTriggerDrawer>
</div>
</template>

Expand All @@ -312,6 +323,7 @@ import ApplicationResourceApi from '@/api/system-resource-management/application
import ResourceAuthorizationDrawer from '@/components/resource-authorization-drawer/index.vue'
import { t } from '@/locales'
import { isAppIcon, resetUrl } from '@/utils/common'
import ResourceTriggerDrawer from '@/views/trigger/ResourceTriggerDrawer.vue'
import useStore from '@/stores'
import { datetimeFormat } from '@/utils/time'
import { loadPermissionApi } from '@/utils/dynamics-api/permission-api.ts'
Expand Down Expand Up @@ -347,6 +359,11 @@ const MoreFilledPermission = () => {
)
}

const resourceTriggerDrawerRef = ref<InstanceType<typeof ResourceTriggerDrawer>>()
const openTriggerDrawer = (data: any) => {
resourceTriggerDrawerRef.value?.open(data)
}

const ResourceAuthorizationDrawerRef = ref()

function openAuthorization(item: any) {
Expand Down
8 changes: 6 additions & 2 deletions ui/src/views/system-resource-management/ToolResourceIndex.vue
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,11 @@

<el-dropdown-item
@click.stop="openTriggerDrawer(row)"
v-if="row.tool_type === 'CUSTOM' && permissionPrecise.trigger_read()"
v-if="
row.tool_type === 'CUSTOM' &&
permissionPrecise.trigger_read() &&
row.is_active
"
>
<AppIcon iconName="app-trigger" class="color-secondary"></AppIcon>
{{ $t('views.trigger.title') }}
Expand All @@ -348,7 +352,7 @@
<el-dropdown-item
text
@click.stop="openToolRecordDrawer(row)"
v-if="permissionPrecise.relate_map()"
v-if="permissionPrecise.record()"
>
<AppIcon iconName="app-schedule-report" class="color-secondary" />
{{ $t('common.ExecutionRecord.subTitle') }}
Expand Down