From b224760aba3260d1f39984fe58dafaa45e3c1194 Mon Sep 17 00:00:00 2001
From: coord_e <me@coord-e.com>
Date: Mon, 18 Jan 2021 00:52:41 +0900
Subject: Fix to wait for the removal of item in i/registry/remove (#7101)

---
 src/server/api/endpoints/i/registry/remove.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/api/endpoints/i/registry/remove.ts b/src/server/api/endpoints/i/registry/remove.ts
index e73444efd2..4f04d653b3 100644
--- a/src/server/api/endpoints/i/registry/remove.ts
+++ b/src/server/api/endpoints/i/registry/remove.ts
@@ -41,5 +41,5 @@ export default define(meta, async (ps, user) => {
 		throw new ApiError(meta.errors.noSuchKey);
 	}
 
-	RegistryItems.remove(item);
+	await RegistryItems.remove(item);
 });
-- 
cgit v1.2.3-freya


From 3762cdc8c00e133ed232afd132797f890530ad62 Mon Sep 17 00:00:00 2001
From: sobadon <sbdn@chasoba.net>
Date: Mon, 18 Jan 2021 00:53:48 +0900
Subject: グループの編集画面をウィンドウで開けないバグを修正 (#7100)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/pages/my-groups/group.vue | 11 +++++++++--
 src/client/router.ts                 |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/client/pages/my-groups/group.vue b/src/client/pages/my-groups/group.vue
index d0d83c9c0e..ab6dc85399 100644
--- a/src/client/pages/my-groups/group.vue
+++ b/src/client/pages/my-groups/group.vue
@@ -45,6 +45,13 @@ export default defineComponent({
 		MkButton
 	},
 
+	props: {
+		groupId: {
+			type: String,
+			required: true,
+		},
+	},
+
 	data() {
 		return {
 			INFO: computed(() => this.group ? {
@@ -58,7 +65,7 @@ export default defineComponent({
 	},
 
 	watch: {
-		$route: 'fetch'
+		groupId: 'fetch',
 	},
 
 	created() {
@@ -69,7 +76,7 @@ export default defineComponent({
 		fetch() {
 			Progress.start();
 			os.api('users/groups/show', {
-				groupId: this.$route.params.group
+				groupId: this.groupId
 			}).then(group => {
 				this.group = group;
 				os.api('users/show', {
diff --git a/src/client/router.ts b/src/client/router.ts
index 6f79426b23..5f2a657459 100644
--- a/src/client/router.ts
+++ b/src/client/router.ts
@@ -55,7 +55,7 @@ export const router = createRouter({
 		{ path: '/my/lists', component: page('my-lists/index') },
 		{ path: '/my/lists/:list', component: page('my-lists/list') },
 		{ path: '/my/groups', component: page('my-groups/index') },
-		{ path: '/my/groups/:group', component: page('my-groups/group') },
+		{ path: '/my/groups/:group', component: page('my-groups/group'), props: route => ({ groupId: route.params.group }) },
 		{ path: '/my/antennas', component: page('my-antennas/index') },
 		{ path: '/my/clips', component: page('my-clips/index') },
 		{ path: '/scratchpad', component: page('scratchpad') },
-- 
cgit v1.2.3-freya