diff --git a/backend/app/db/cruddb/dbapp.py b/backend/app/db/cruddb/dbapp.py index f1b3721..f9bfbad 100644 --- a/backend/app/db/cruddb/dbapp.py +++ b/backend/app/db/cruddb/dbapp.py @@ -151,7 +151,7 @@ class dbapp(crudbase): flow.flowid = flowhistory.flowid flow.eventid=flowhistory.eventid flow.name=flowhistory.name - flow.content=flow.content + flow.content=flowhistory.content flow.updateuserid=userid db.add(flow) db.commit() diff --git a/frontend/src/pages/AppManagement.vue b/frontend/src/pages/AppManagement.vue index 3a07975..9cdda9e 100644 --- a/frontend/src/pages/AppManagement.vue +++ b/frontend/src/pages/AppManagement.vue @@ -46,7 +46,7 @@ - + @@ -114,8 +114,8 @@ const deleteDialog = ref(false); const deleteUserLoading = ref(false); const actionList = [ - { label: '設定', icon: 'account_tree', action: toEditFlowPage }, - { label: '履歴', icon: 'history', action: showHistory }, + { label: 'フローの編集', icon: 'account_tree', action: toEditFlowPage }, + { label: 'バージョンの切替', icon: 'history', action: showHistory }, { separator: true }, { label: '削除', icon: 'delete_outline', class: 'text-red', action: removeRow }, ]; diff --git a/frontend/src/pages/TenantDomain.vue b/frontend/src/pages/TenantDomain.vue index 8d9cff9..7fbe76b 100644 --- a/frontend/src/pages/TenantDomain.vue +++ b/frontend/src/pages/TenantDomain.vue @@ -122,12 +122,12 @@ - ドメイン利用権限が存在し、キャンセルする必要がある + ドメインは使用中です。削除してもよろしいですか? - - + + @@ -196,7 +196,7 @@ const shareDg = ref(false); const shareDomain = ref({} as IDomainOwnerDisplay); const activeOptions = [ - { value: 0, label: '全状態' }, + { value: 0, label: 'すべて' }, { value: 1, label: '使用' }, { value: 2, label: '未使用'} ]