{str(
diff --git a/resources/ts/back/Pages/Users/Form.tsx b/resources/ts/back/Pages/Users/Form.tsx
index e94c2de..dbe51c5 100644
--- a/resources/ts/back/Pages/Users/Form.tsx
+++ b/resources/ts/back/Pages/Users/Form.tsx
@@ -159,21 +159,22 @@ export default function Form({
/>
)}
- {userModel.role.value === isConceptor!.value && (
- }
- description={transFormSubtitleVisibility}
- inline
- >
-
-
- )}
+ {userModel.role.value === isConceptor!.value &&
+ userModel.email !== model?.email && (
+ }
+ description={transFormSubtitleVisibility}
+ inline
+ >
+
+
+ )}
{
const rowRole = row.getValue("role") as UserModel["role"];
return (
- {str(String(rowRole?.label ?? '')).ucFirst().value()}
+ {str(String(rowRole?.label ?? ""))
+ .ucFirst()
+ .value()}
);
},
diff --git a/resources/ts/back/Pages/Users/Show.tsx b/resources/ts/back/Pages/Users/Show.tsx
index 0fb58ff..5eecf2b 100644
--- a/resources/ts/back/Pages/Users/Show.tsx
+++ b/resources/ts/back/Pages/Users/Show.tsx
@@ -55,7 +55,9 @@ const getColumns = () => {
.value(),
cell: ({ value }: { value: UserModel["role"] }) => (
- {str(String(value?.label ?? '')).ucFirst().value()}
+ {str(String(value?.label ?? ""))
+ .ucFirst()
+ .value()}
),
},
diff --git a/resources/ts/back/types/project.d.ts b/resources/ts/back/types/project.d.ts
index fc99f24..a0005dc 100644
--- a/resources/ts/back/types/project.d.ts
+++ b/resources/ts/back/types/project.d.ts
@@ -1,18 +1,19 @@
import { LaravelEnum } from "@/types/global";
import { DefaultModel } from "@/back/types/global";
+import { TranslationField } from "@/back/types/i18n";
type NoticeModel = DefaultModel & {
- title: TranslationField;
- message: TranslationField;
- type: LaravelEnum;
+ title: TranslationField;
+ message: TranslationField;
+ type: LaravelEnum;
};
type InvoicePackageModel = DefaultModel & {
- name: TranslationField;
- amount: number;
- published: boolean;
+ name: TranslationField;
+ amount: number;
+ published: boolean;
};
type InvoiceCompanyModel = DefaultModel & {
- name: TranslationField;
+ name: TranslationField;
};