Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-29 13:36:13 +00:00
Code Issues Actions Projects Releases Wiki Activity

merge conflicts fixed

Browse Source
This commit is contained in:
Julie Lenaerts 2022-01-14 16:13:35 +01:00
commit 47615e2e5d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
View File

@ -61,6 +61,15 @@
</on-the-fly-thirdparty> </on-the-fly-thirdparty>
</template> </template>
<template v-slot:body v-else-if="parent">
<on-the-fly-thirdparty
:parent="parent"
:action="action"
type="thirdparty"
ref="castThirdparty">
</on-the-fly-thirdparty>
</template>
<template v-slot:body v-else> <template v-slot:body v-else>
<on-the-fly-create <on-the-fly-create
:action="action" :action="action"

3
src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js
View File

@ -21,6 +21,9 @@ const ontheflyMessages = {
title: "Créer un contact pour {q}" title: "Créer un contact pour {q}"
} }
resource_comment_title: "Un commentaire est associé à cet interlocuteur" resource_comment_title: "Un commentaire est associé à cet interlocuteur"
addContact: {
title: "Créer un contact pour {q}"
}
} }
} }
} }