Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-27 09:05:01 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into ticket-app-master

Browse Source 
# Conflicts:
#	src/Bundle/ChillPersonBundle/Resources/public/types.ts
#	src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
This commit is contained in:
Julien Fastré
2025-07-02 17:28:59 +02:00
parent b451d2c4a3 70e75adb7d
commit 06e8264dde
84 changed files with 1689 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js
View File

@@ -11,10 +11,12 @@ const appMessages = {
user: "Utilisateurs",
person: "Usagers",
thirdparty: "Tiers",
acpw: "Action d'accompagnements",
modal_title_one: "Indiquer un ",
user_one: "Utilisateur",
thirdparty_one: "Tiers",
person_one: "Usager",
acpw_one: "Action d'accompagnement",
},
},
};

8
src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
View File

@@ -1,11 +1,11 @@
<template>
<span class="chill-entity entity-user">
{{ user.label }}
<span class="user-job" v-if="user.user_job !== null"
> ({{ localizeString(user.user_job.label) }})</span
<span class="user-job" v-if="user.user_job !== null">
({{ localizeString(user.user_job.label) }})</span
>
<span class="main-scope" v-if="user.main_scope !== null"
> ({{ localizeString(user.main_scope.name) }})</span
<span class="main-scope" v-if="user.main_scope !== null">
({{ localizeString(user.main_scope.name) }})</span
>
<span
v-if="user.isAbsent"