From d2e85056897655c7c37e331a9f44ee9d7f936070 Mon Sep 17 00:00:00 2001 From: SimonGschnell Date: Tue, 10 Jun 2025 14:49:30 +0200 Subject: [PATCH] refactor(Profil alias): checks if user has alias, creates extern alias email if available otherwise not --- .../controllers/api/frontend/v1/Profil.php | 5 ++-- .../Cis/Profil/ProfilComponents/Kontakt.js | 2 ++ .../Profil/ProfilComponents/ProfilEmails.js | 24 ++++++++++--------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php index c52d8bae5..d8e22ec29 100644 --- a/application/controllers/api/frontend/v1/Profil.php +++ b/application/controllers/api/frontend/v1/Profil.php @@ -232,7 +232,8 @@ class Profil extends FHCAPI_Controller $intern_email["email"] = $uid . "@" . DOMAIN; $extern_email = array(); $extern_email["type"] = "alias"; - $extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN; + + $extern_email["email"] = $benutzer_res->alias? ($benutzer_res->alias. "@" . DOMAIN) : null; $res->emails = array($intern_email, $extern_email); $res->funktionen = $benutzer_funktion_res; @@ -345,7 +346,7 @@ class Profil extends FHCAPI_Controller $intern_email["email"] = $this->uid . "@" . DOMAIN; $extern_email = array(); $extern_email["type"] = "alias"; - $extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN; + $extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) :null; $res->emails = [$intern_email, $extern_email]; $res->funktionen = $benutzer_funktion_res; diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js index 3d703f6b6..6dd6edeb4 100644 --- a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js +++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js @@ -12,6 +12,7 @@ export default{ }, template:/*html*/` + `, }; \ No newline at end of file diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js index 1342aed8e..b5fc345ee 100644 --- a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js +++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js @@ -20,17 +20,19 @@ export default {
-
-
- -
-
-
-
{{email.type}}
- {{email.email}} -
-
-
+