#4 update vendors

composer.lock

@@ -1947,7 +1947,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "a2b2110a69a21e2691266d66e421d2e56dff1c8a"
+                "reference": "fa71200c9b2fbad8f4b11ad414161bffb9e81811"
             },
             "type": "library",
             "autoload": {
@@ -1962,7 +1962,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2019-02-11T17:28:26+00:00"
+            "time": "2019-02-27T12:04:23+00:00"
         },
         {
             "name": "ik/check-sintax-bundle",
@@ -2083,7 +2083,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/migrations.git",
-                "reference": "f786c642a32803b11cda2514940d69bce81116ac"
+                "reference": "f28fb9789575889674e392a84e85a98d4b7dc0bb"
             },
             "type": "library",
             "autoload": {
@@ -2098,7 +2098,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2019-01-31T11:55:56+00:00"
+            "time": "2019-02-01T12:35:40+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -2202,7 +2202,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "68f356b67da08b94cdb7613ad58c5525c88ff950"
+                "reference": "dcf83af721a56b40e4f521ebf53cc0918c7aa1f3"
             },
             "require": {
                 "ext-curl": "*",
@@ -2215,7 +2215,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2019-01-31T13:36:09+00:00"
+            "time": "2019-02-27T12:06:15+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -2223,7 +2223,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "8bd50352aca1344d96bdd300a3bfb74d9041e431"
+                "reference": "47079cbd49260d35df40e9309564112d511f2474"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -2253,7 +2253,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2019-02-21T13:09:25+00:00"
+            "time": "2019-02-28T17:24:48+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",

src/FTTHBundle/Admin/ONUAdmin.php

@@ -205,7 +205,9 @@ class ONUAdmin extends WorkflowBaseAdmin
                                     return $choiceValue->getName();
                                 },
                                 'group_by' => function($value, $key, $index) {
-                                    return $value->getOlt()->getName();
+                                    if ($value->getOlt()) {
+                                        return $value->getOlt()->getName();
+                                    }
                                 },
                             ))
                     ->add('model')

src/FTTHBundle/Controller/REST/ONURESTController.php

@@ -93,30 +93,30 @@ class ONURESTController extends RESTController
     public function applyAction(Request $request, Int $id, String $workflow, String $transition)
     {
         $tenancyService = $this->getTenancyService();
-
         try {
+            $em = $this->container->get("doctrine.orm.entity_manager");
+            $tenancyService->disableFilter();
+            $entity = $em->getRepository('FTTHBundle:ONU')->find($id);
 
-        $em = $this->container->get("doctrine.orm.entity_manager");
-        $tenancyService->disableFilter();
-        $entity = $em->getRepository('FTTHBundle:ONU')->find($id);
+            $wr = $this->container->get("workflow.registry");
+            $wf = $wr->get($entity, $workflow);
 
-	    $wr = $this->container->get("workflow.registry");
-	    $wf = $wr->get($entity, $workflow);
+            $newState = $wf->apply($entity, $transition);
 
-	    $newState = $wf->apply($entity, $transition);
+            $validator = $this->container->get('validator');
+            $errors = $validator->validate($entity);
 
-	    $validator = $this->container->get('validator');
-	    $errors = $validator->validate($entity);
-	    if (count($errors) > 0) {
-            $errorsString = (string) $errors;
-            $tenancyService->enableFilter();
-		    return FOSView::create($errorsString, Codes::HTTP_INTERNAL_SERVER_ERROR);
-	    }else{
-		    $em->persist($entity);
-            $em->flush($entity);
-            $tenancyService->enableFilter();
-		    return $entity;
-	    }
+            if (count($errors) > 0) {
+                $errorsString = (string) $errors;
+                $tenancyService->enableFilter();
+
+                return FOSView::create($errorsString, Codes::HTTP_INTERNAL_SERVER_ERROR);
+            }else{
+                $em->flush($entity);
+                $tenancyService->enableFilter();
+                
+                return $entity;
+            }
         } catch (\Exception $e) {
             return FOSView::create($e->getMessage(), Codes::HTTP_INTERNAL_SERVER_ERROR);
         }