mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-09-30 18:39:43 +00:00
Merge branch 'refs/heads/master' into ticket-app-master
# Conflicts: # src/Bundle/ChillPersonBundle/Resources/public/types.ts # src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
This commit is contained in:
@@ -61,6 +61,9 @@ export interface ConflictHttpExceptionInterface
|
||||
|
||||
/**
|
||||
* Generic api method that can be adapted to any fetch request
|
||||
*
|
||||
* This method is suitable make a single fetch. When performing a GET to fetch a list of elements, always consider pagination
|
||||
* and use of the @link{fetchResults} method.
|
||||
*/
|
||||
export const makeFetch = <Input, Output>(
|
||||
method: "POST" | "GET" | "PUT" | "PATCH" | "DELETE",
|
||||
|
@@ -224,3 +224,7 @@ export interface WorkflowAttachment {
|
||||
updatedBy: User | null;
|
||||
genericDoc: null | GenericDoc;
|
||||
}
|
||||
|
||||
export interface PrivateCommentEmbeddable {
|
||||
comments: Record<number, string>;
|
||||
}
|
||||
|
@@ -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",
|
||||
},
|
||||
},
|
||||
};
|
||||
|
@@ -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"
|
||||
|
Reference in New Issue
Block a user