wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

fix: refs #6630 resolve conficts

This commit is contained in:
Jorge Penadés 2024-01-10 15:41:00 +01:00
parent 0eb7d0f1b0
commit cdadb57af3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/VnLog.vue
View File

@ -428,6 +428,7 @@ setLogTree();
:class="{ 'cursor-pointer': userLog.user.id }" :class="{ 'cursor-pointer': userLog.user.id }"
:worker-id="userLog.user.id" :worker-id="userLog.user.id"
:title="userLog.user.nickname" :title="userLog.user.nickname"
size="md"
/> />
</template> </template>
</VnUserLink> </VnUserLink>
@ -666,7 +667,6 @@ setLogTree();
option-label="locale" option-label="locale"
:options="actions" :options="actions"
@update:model-value="selectFilter('action')" @update:model-value="selectFilter('action')"
@clear="() => selectFilter('action')"
hide-selected hide-selected
/> />
</QItem> </QItem>

1
src/components/ui/VnAvatar.vue
View File

@ -4,6 +4,7 @@ import { useSession } from 'src/composables/useSession';
const $props = defineProps({ const $props = defineProps({
workerId: { type: Number, required: true }, workerId: { type: Number, required: true },
description: { type: String, default: null }, description: { type: String, default: null },
size: { type: String, default: 'xl' },
}); });
const session = useSession(); const session = useSession();
const token = session.getToken(); const token = session.getToken();