mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-12-23 21:53:09 +02:00
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
fe52f7c392
3 changed files with 11 additions and 4 deletions
|
@ -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', {
|
||||
|
|
|
@ -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') },
|
||||
|
|
|
@ -41,5 +41,5 @@ export default define(meta, async (ps, user) => {
|
|||
throw new ApiError(meta.errors.noSuchKey);
|
||||
}
|
||||
|
||||
RegistryItems.remove(item);
|
||||
await RegistryItems.remove(item);
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue