From 8e0a9287e947e9ee5cb7457425860887d76d1545 Mon Sep 17 00:00:00 2001
From: "xiaozhe.ma" <xiaozhe.ma@jp.ricoh.com>
Date: Tue, 10 Dec 2024 20:10:37 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E8=A8=80=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/db/cruddb/dbapp.py       | 2 +-
 frontend/src/pages/AppManagement.vue | 6 +++---
 frontend/src/pages/TenantDomain.vue  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

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 @@
       <app-select-box ref="appDialog" name="アプリ" type="single" :filter="dgFilter" :filterInitRowsFunc="filterInitRows" />
     </show-dialog>
 
-    
+
     <show-dialog v-model:visible="showVersionHistory" :name="targetRow?.name + 'のバージョン履歴'" @close="closeHistoryDg" min-width="30vw" :ok-btn-auto-close="false" :ok-btn-loading="isAdding"
       ok-btn-label="選択">
       <version-history ref="versionDialog" :app="targetRow" />
@@ -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 @@
         </q-card-section>
         <q-card-section v-else class="row items-center">
           <q-icon name="error" color="negative" size="2em" />
-          <span class="q-ml-sm">ドメイン利用権限が存在し、キャンセルする必要がある</span>
+          <span class="q-ml-sm">ドメインは使用中です。削除してもよろしいですか？</span>
         </q-card-section>
 
         <q-card-actions align="right">
-          <q-btn flat label="Cancel" color="primary" v-close-popup />
-          <q-btn v-if="deleteLoadingState > 0" label="処理に行く" color="primary" v-close-popup @click="openShareDg(editId)" />
+          <q-btn flat label="キャンセル" color="primary" v-close-popup />
+          <q-btn v-if="deleteLoadingState > 0" label="実行" color="primary" v-close-popup @click="openShareDg(editId)" />
           <q-btn flat v-else label="OK" :disabled="deleteLoadingState" color="primary" v-close-popup @click="deleteDomain()" />
         </q-card-actions>
       </q-card>
@@ -196,7 +196,7 @@ const shareDg = ref(false);
 const shareDomain = ref<IDomainOwnerDisplay>({} as IDomainOwnerDisplay);
 
 const activeOptions = [
-  { value: 0, label: '全状態' },
+  { value: 0, label: 'すべて' },
   { value: 1, label: '使用' },
   { value: 2, label: '未使用'}
 ]

From 74e8b78f6d9cee9df1ed41579220473f26bc8e0a Mon Sep 17 00:00:00 2001
From: "xiaozhe.ma" <xiaozhe.ma@jp.ricoh.com>
Date: Tue, 10 Dec 2024 21:05:50 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E8=A8=80=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/AppManagement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/AppManagement.vue b/frontend/src/pages/AppManagement.vue
index ba63b38..57fd178 100644
--- a/frontend/src/pages/AppManagement.vue
+++ b/frontend/src/pages/AppManagement.vue
@@ -101,7 +101,7 @@ const deleteUserLoading = ref(false);
 
 const actionList =  [
   { label: 'フローの編集', icon: 'account_tree', action: toEditFlowPage },
-  { label: 'バージョンの切替', icon: 'history', action: toVersionHistoryPage },
+  { label: 'バージョンの管理', icon: 'history', action: toVersionHistoryPage },
   { separator: true },
   { label: '削除', icon: 'delete_outline', class: 'text-red', action: removeRow },
 ];