Skip to content

Commit c237985

Browse files
committed
minor improvements
1 parent 30d9997 commit c237985

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

client/src/components/accounts/users.vue

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@
7070
</v-btn>
7171
</template>
7272
<template v-slot:[`item.username`]="{ item }">
73-
<v-avatar size="32" class="mr-2">
74-
<v-img :src="`/api/users/${item.id}/avatar`" />
75-
</v-avatar>
76-
<b><span><nobr>{{ item.username }}</nobr></span></b>
73+
<b><span><nobr>
74+
<v-avatar size="30" class="mr-2">
75+
<v-img :src="item.image || '/img/icons/avatar.svg'" alt="User avatar" />
76+
</v-avatar>{{ item.username }}
77+
</nobr></span></b>
7778
</template>
7879
<template v-slot:[`item.createdAt`]="{ item }">
7980
{{ formatDate(item.createdAt) }}
@@ -263,6 +264,7 @@ export default defineComponent({
263264
isActive: boolean;
264265
createdAt: string;
265266
updatedAt: string;
267+
image?: string;
266268
role?: {
267269
id: number;
268270
name: string;
@@ -304,7 +306,6 @@ export default defineComponent({
304306
const writeUserPermission = authStore.hasPermission('user:write')
305307
306308
const headers = [
307-
{ title: 'Status', value: 'isActive' },
308309
{ title: 'Username', value: 'username' },
309310
{ title: 'Name', value: 'name' },
310311
//{ title: 'First Name', value: 'firstName' },
@@ -316,6 +317,7 @@ export default defineComponent({
316317
{ text: 'Created', value: 'createdAt' },
317318
{ text: 'Updated', value: 'updatedAt' },
318319
*/
320+
{ title: 'Status', value: 'isActive' },
319321
{ title: 'Actions', value: 'actions', sortable: false, align: 'end' as const },
320322
]
321323

server/src/apps/apps.controller.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,13 @@ export class AppsController {
272272
Logger.error(msg);
273273
throw new HttpException(msg, HttpStatus.BAD_REQUEST);
274274
}
275+
/*
275276
if (!Array.isArray(body.command)) {
276277
const msg = 'Command must be an array';
277-
Logger.error(msg);
278+
Logger.error(msg, body.command);
278279
throw new HttpException(msg, HttpStatus.BAD_REQUEST);
279280
}
281+
*/
280282
if (body.command.length === 0) {
281283
const msg = 'Command array cannot be empty';
282284
Logger.error(msg);

0 commit comments

Comments
 (0)