summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-03-12 16:38:08 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-03-12 16:38:08 +0900
commit7c2d8d73ce3dc407a57925562b48357e54c315e6 (patch)
tree46c1145bbf388f01d94002f68c67360054a73f2e /packages/frontend/src
parentfix(backend/ApRendererService): allow announces with visibility: followers (#... (diff)
downloadmisskey-7c2d8d73ce3dc407a57925562b48357e54c315e6.tar.gz
misskey-7c2d8d73ce3dc407a57925562b48357e54c315e6.tar.bz2
misskey-7c2d8d73ce3dc407a57925562b48357e54c315e6.zip
enhance: ロールの並び順を設定可能に
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/pages/admin/roles.edit.vue1
-rw-r--r--packages/frontend/src/pages/admin/roles.editor.vue6
-rw-r--r--packages/frontend/src/pages/explore.roles.vue8
3 files changed, 10 insertions, 5 deletions
diff --git a/packages/frontend/src/pages/admin/roles.edit.vue b/packages/frontend/src/pages/admin/roles.edit.vue
index ac6cca84c1..e6896237f8 100644
--- a/packages/frontend/src/pages/admin/roles.edit.vue
+++ b/packages/frontend/src/pages/admin/roles.edit.vue
@@ -55,6 +55,7 @@ if (props.id) {
isPublic: false,
asBadge: false,
canEditMembersByModerator: false,
+ displayOrder: 0,
policies: {},
};
}
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index 2fb605f8c0..408bbc6460 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -17,6 +17,11 @@
<template #label>{{ i18n.ts._role.iconUrl }}</template>
</MkInput>
+ <MkInput v-model="role.displayOrder" type="number">
+ <template #label>{{ i18n.ts._role.displayOrder }}</template>
+ <template #caption>{{ i18n.ts._role.descriptionOfDisplayOrder }}</template>
+ </MkInput>
+
<MkSelect v-model="rolePermission" :readonly="readonly">
<template #label><i class="ti ti-shield-lock"></i> {{ i18n.ts._role.permission }}</template>
<template #caption><div v-html="i18n.ts._role.descriptionOfPermission.replaceAll('\n', '<br>')"></div></template>
@@ -444,6 +449,7 @@ const save = throttle(100, () => {
description: role.description,
color: role.color === '' ? null : role.color,
iconUrl: role.iconUrl === '' ? null : role.iconUrl,
+ displayOrder: role.displayOrder,
target: role.target,
condFormula: role.condFormula,
isAdministrator: role.isAdministrator,
diff --git a/packages/frontend/src/pages/explore.roles.vue b/packages/frontend/src/pages/explore.roles.vue
index 51177d079c..6ac469f7ba 100644
--- a/packages/frontend/src/pages/explore.roles.vue
+++ b/packages/frontend/src/pages/explore.roles.vue
@@ -1,5 +1,5 @@
<template>
-<MkSpacer :content-max="1200">
+<MkSpacer :content-max="700">
<div class="_gaps_s">
<MkRolePreview v-for="role in roles" :key="role.id" :role="role" :for-moderation="false"/>
</div>
@@ -13,10 +13,8 @@ import * as os from '@/os';
let roles = $ref();
-os.api('roles/list', {
- limit: 30,
-}).then(res => {
- roles = res.filter(x => x.target === 'manual');
+os.api('roles/list').then(res => {
+ roles = res.filter(x => x.target === 'manual').sort((a, b) => b.displayOrder - a.displayOrder);
});
</script>