Merge branch 'dev' into fixCypressE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Pablo Natek 2024-04-23 07:39:01 +00:00
commit f85c44e1e2
2 changed files with 3 additions and 3 deletions

View File

@ -32,7 +32,7 @@ async function insert() {
<template>
<QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
<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">
<VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
{{ t('globals.now') }}

View File

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