Implement portals import

fsr5-fhaachen · Oct 20, 2023 · f8c96f8 · f8c96f8
1 parent 404c6be
commit f8c96f8
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/app/Http/Controllers/PortalsController.php b/app/Http/Controllers/PortalsController.php
@@ -81,9 +81,15 @@ public function importUsers(Request $request)
                 if(!in_array($abbreviation, ['INF', 'ET', 'WI', 'DIB', 'MCD'])) {
                     if($abbreviation == 'SBE') {
                         $abbreviation = 'ET';
+<<<<<<< HEAD
                     } else if($abbreviation == 'ET-MASTER') {
                         $abbreviation = 'ET';
                     } else if($abbreviation == 'ISE-MASTER') {
+=======
+                    } else if($abbreviation == 'ET-Master') {
+                        $abbreviation = 'ET';
+                    } else if($abbreviation == 'ISE-Master') {
+>>>>>>> 625c235 (Implement portals import)
                         $abbreviation = 'INF';
                     } else {
                         $abbreviation = 'INF';
@@ -94,7 +100,11 @@ public function importUsers(Request $request)
             }
 
             // import image
+<<<<<<< HEAD
             $person->img = (!empty($user['avatarUrl']) ? $user['avatarUrl'] : '');
+=======
+            $person->img = '';
+>>>>>>> 625c235 (Implement portals import)
 
             // cheeck roles
             $roles = $user['roles'];