github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix typing issue + fix presets detail page

Browse Source
This commit is contained in:
rijkvanzanten
2020-08-12 18:49:04 -04:00
parent 1222c1d97d
commit 05dd176239
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/modules/settings/routes/presets/detail/detail.vue
View File

@@ -191,9 +191,9 @@ export default defineComponent({
if (edits.value.scope) {
if (edits.value.scope.startsWith('role_')) {
editsParsed.role = +edits.value.scope.substring(5);
editsParsed.role = edits.value.scope.substring(5);
} else if (edits.value.scope.startsWith('user_')) {
editsParsed.user = +edits.value.scope.substring(5);
editsParsed.user = edits.value.scope.substring(5);
}
}
@@ -434,7 +434,7 @@ export default defineComponent({
field: 'collection',
name: i18n.t('collection'),
type: 'string',
system: {
meta: {
interface: 'dropdown',
options: {
choices: collectionsStore.state.collections
@@ -456,7 +456,7 @@ export default defineComponent({
field: 'scope',
name: i18n.t('scope'),
type: 'string',
system: {
meta: {
interface: 'dropdown',
options: {
choices: scopeChoices.value,
@@ -468,7 +468,7 @@ export default defineComponent({
field: 'layout',
name: i18n.t('layout'),
type: 'string',
system: {
meta: {
interface: 'dropdown',
options: {
choices: layouts.map((layout) => ({
@@ -483,7 +483,7 @@ export default defineComponent({
field: 'name',
name: i18n.t('name'),
type: 'string',
system: {
meta: {
interface: 'text-input',
width: 'half',
options: {
@@ -495,7 +495,7 @@ export default defineComponent({
field: 'divider',
name: i18n.t('divider'),
type: 'alias',
system: {
meta: {
interface: 'divider',
width: 'fill',
options: {

3
app/src/stores/user.ts
View File

@@ -17,8 +17,7 @@ export const useUserStore = createStore({
return state.currentUser.first_name + ' ' + state.currentUser.last_name;
},
isAdmin(state) {
/** @todo base this on UUID */
return state.currentUser?.role.id === 1;
return state.currentUser?.role.admin === true || false;
},
},
actions: {

4
app/src/types/presets.ts
View File

@@ -31,8 +31,8 @@ export type Filter = {
export type Preset = {
id?: number;
title: string | null;
user: number | null;
role: number | null;
user: string | null;
role: string | null;
collection: string;
search_query: string | null;
filters: readonly Filter[] | null;