Bläddra i källkod

Fix para el caso que el usuario no tenga tenencia

Guillermo Espinoza 7 år sedan
förälder
incheckning
ab14b02498
1 ändrade filer med 15 tillägg och 13 borttagningar
  1. 15 13
      Controller/OAuthController.php

+ 15 - 13
Controller/OAuthController.php

@@ -26,19 +26,21 @@ class OAuthController extends Controller
             $data['roles'] = $user->getRoles();
 
             // Tenancies del usuario
-            $tenancies = $this->get('base_tenancy.tenancy_service')->getTenancies();
-            $t = array();
-            foreach ($tenancies as $tenancy) {
-                $id = $tenancy->getId();
-                $name = $tenancy->getName();
-                $t[] = compact('id', 'name');
-            }
-            $data['tenancies'] = $t;
-            $tenancyCurrent = $this->getUser()->getTenancyCurrent();
-            $data['tenancyCurrent'] = array();
-            if (!is_null($tenancyCurrent)) {
-                $data['tenancyCurrent']['id'] = $tenancyCurrent->getId();
-                $data['tenancyCurrent']['name'] = $tenancyCurrent->getName();
+            if ($this->has('base_tenancy.tenancy_service') && method_exists($user, 'getTenancyCurrent')) {
+                $tenancies = $this->get('base_tenancy.tenancy_service')->getTenancies();
+                $t = array();
+                foreach ($tenancies as $tenancy) {
+                    $id = $tenancy->getId();
+                    $name = $tenancy->getName();
+                    $t[] = compact('id', 'name');
+                }
+                $data['tenancies'] = $t;
+                $tenancyCurrent = $user->getTenancyCurrent();
+                $data['tenancyCurrent'] = array();
+                if (!is_null($tenancyCurrent)) {
+                    $data['tenancyCurrent']['id'] = $tenancyCurrent->getId();
+                    $data['tenancyCurrent']['name'] = $tenancyCurrent->getName();
+                }
             }
         }