Luciano Andrade 7 jaren geleden
bovenliggende
commit
bcf4f929fb
3 gewijzigde bestanden met toevoegingen van 7 en 8 verwijderingen
  1. 1 1
      .drone.yml
  2. 6 1
      src/FTTHBundle/EventListener/ONUSubscriber.php
  3. 0 6
      src/FTTHBundle/Form/ONUType.php

+ 1 - 1
.drone.yml

@@ -41,7 +41,7 @@ pipeline:
       - touch var/logs/test.log
 
       - tail -f var/logs/*.log &
-      - bin/console server:run --help --end=prod
+      - bin/console server:run --end=prod &
       - vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist
 
  docker:

+ 6 - 1
src/FTTHBundle/EventListener/ONUSubscriber.php

@@ -165,7 +165,12 @@ class ONUSubscriber implements EventSubscriber
 	if($onu->getNAP() and $onu->getNAP()->getOLT()){
 	    $sp = $onu->getServicePort();
 
-            $model_extra_data = $onu->getNAP()->getOLT()->getModel()->jsonExtraData();
+	    if($onu->getNAP()->getOLT()->getModel()){
+            	$model_extra_data = $onu->getNAP()->getOLT()->getModel()->jsonExtraData();
+	    }else{
+            	$model_extra_data = array();
+	    }
+		
 	    if((isset($model_extra_data['auto-create-service-ports']) and  $model_extra_data['auto-create-service-ports'] === true)
 	       and count($sp) == 0){
 	    	$olt = $onu->getNAP()->getOLT();

+ 0 - 6
src/FTTHBundle/Form/ONUType.php

@@ -43,12 +43,6 @@ class ONUType extends AbstractType
             ->add('nap')
             ->add('ponSerialNumber')
             ->add('clientId')
-	    ->add('servicePort',CollectionType::class, array(
-			'entry_type' => "FTTHBundle\\Form\\ServicePortType",
-			'allow_add' => true,
-			'allow_delete' => true,
-			'required' => true,
-		))
             ->add('extraData')
             ->add('tenancyId');