forked from verdnatura/salix-front
fix: refs #6630 resolve conficts
This commit is contained in:
parent
0eb7d0f1b0
commit
cdadb57af3
|
@ -428,6 +428,7 @@ setLogTree();
|
|||
:class="{ 'cursor-pointer': userLog.user.id }"
|
||||
:worker-id="userLog.user.id"
|
||||
:title="userLog.user.nickname"
|
||||
size="md"
|
||||
/>
|
||||
</template>
|
||||
</VnUserLink>
|
||||
|
@ -666,7 +667,6 @@ setLogTree();
|
|||
option-label="locale"
|
||||
:options="actions"
|
||||
@update:model-value="selectFilter('action')"
|
||||
@clear="() => selectFilter('action')"
|
||||
hide-selected
|
||||
/>
|
||||
</QItem>
|
||||
|
|
|
@ -4,6 +4,7 @@ import { useSession } from 'src/composables/useSession';
|
|||
const $props = defineProps({
|
||||
workerId: { type: Number, required: true },
|
||||
description: { type: String, default: null },
|
||||
size: { type: String, default: 'xl' },
|
||||
});
|
||||
const session = useSession();
|
||||
const token = session.getToken();
|
||||
|
|
Loading…
Reference in New Issue