verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 63 Releases Wiki Activity

fix(VnNotes): refs #6336 VnAvatar #313

Merged
alexm merged 2 commits from 6336_fix_vn_notes_VnAvatar into dev 2024-04-23 07:24:42 +00:00
Conversation 0 Commits 2 Files Changed 2 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ui/VnNotes.vue
View File

@ -32,7 +32,7 @@ async function insert() {
<template> <template>
<QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote"> <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
<QCardSection horizontal> <QCardSection horizontal>
<VnAvatar :descriptor="false" :worker-id="1" size="md" /> <VnAvatar :worker-id="currentUser.id" size="md" />
<div class="full-width row justify-between q-pa-xs"> <div class="full-width row justify-between q-pa-xs">
<VnUserLink :name="t('New note')" :worker-id="currentUser.id" /> <VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
{{ t('globals.now') }} {{ t('globals.now') }}

4
src/pages/Worker/Card/WorkerDescriptor.vue
View File

@ -31,7 +31,7 @@ const entityId = computed(() => {
}); });
const worker = ref(); const worker = ref();
const filter = { where: { id: route.params.id}}; const filter = { where: { id: entityId } };
const sip = ref(null); const sip = ref(null);
@ -60,7 +60,7 @@ const setData = (entity) => {
<CardDescriptor <CardDescriptor
module="Worker" module="Worker"
data-key="workerData" data-key="workerData"
:url="`Workers/summary`" url="Workers/summary"
:filter="filter" :filter="filter"
:title="data.title" :title="data.title"
:subtitle="data.subtitle" :subtitle="data.subtitle"