From cdadb57af38c0b3f749c8d551775c251f95765d8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 10 Jan 2024 15:41:00 +0100
Subject: [PATCH] fix: refs #6630 resolve conficts

---
 src/components/common/VnLog.vue | 2 +-
 src/components/ui/VnAvatar.vue  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 1a271f50f..b42dac386 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -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>
diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index 566497395..d26aeac19 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -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();