Merge branch '9' into 'master'

9

See merge request interlink-sa/flowdat3/modules/ftth!125

composer.lock

@@ -1947,7 +1947,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "fa71200c9b2fbad8f4b11ad414161bffb9e81811"
+                "reference": "a6fd19876e0d86411c14ded84d63dd82023bab8e"
             },
             "type": "library",
             "autoload": {
@@ -1962,7 +1962,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2019-02-27T12:04:23+00:00"
+            "time": "2019-03-07T15:47:08+00:00"
         },
         {
             "name": "ik/check-sintax-bundle",

src/FTTHBundle/Admin/ONUAdmin.php

@@ -61,14 +61,21 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->add('logOLT.date')
         ;
     }
-
+    
     /**
      * @param ListMapper $listMapper
      */
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
-            // src/FTTHBundle/Controller/ONUCRUDController.php L43-L55
+            ->add('_action', 'with-workflow-action', array(
+                'actions' => array(
+                    'show' => array(),
+                    'edit' => array(),
+                    'delete' => array(),
+                    'state' => array('template' => 'WorkflowBundle:Workflow:show_transitions.html.twig')
+                )))
+        // src/FTTHBundle/Controller/ONUCRUDController.php L43-L55
             // Se consulta una sola vez y se traen todos los clientes por id
             ->add('client', 'string', array(
                 'template' => 'FTTHBundle:ONU:base_list_field_client.html.twig'
@@ -99,13 +106,6 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->add('logOLT.status', 'string', array(
                 'template' => 'FTTHBundle:Type:list_status_field_type.html.twig'))
             ->add('logOLT.date')
-            ->add('_action', 'with-workflow-action', array(
-                'actions' => array(
-                    'show' => array(),
-                    'edit' => array(),
-                    'delete' => array(),
-                    'state' => array('template' => 'WorkflowBundle:Workflow:show_transitions.html.twig')
-                )))
         ;
     }
 

src/FTTHBundle/Entity/ONU.php

@@ -207,7 +207,7 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
     protected $vlans;
 
     /**
-     * @ORM\ManyToOne(targetEntity="TContProfile", inversedBy="onus", fetch="EXTRA_LAZY")
+     * @ORM\ManyToOne(targetEntity="TContProfile", fetch="EXTRA_LAZY")
      * @ORM\JoinColumn(name="tcontprofile_id", referencedColumnName="id", onDelete="SET NULL")
      *
      * @JMS\MaxDepth(1)
@@ -231,7 +231,7 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
     protected $trafficProfileIn;
 
     /**
-     * @ORM\ManyToOne(targetEntity="VLanID", inversedBy="onus", fetch="EXTRA_LAZY")
+     * @ORM\ManyToOne(targetEntity="VLanID", fetch="EXTRA_LAZY")
      * @ORM\JoinColumn(name="vlan_id", referencedColumnName="id", onDelete="SET NULL")
      *
      * @JMS\MaxDepth(1)
@@ -239,7 +239,7 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
     protected $vlan;
 
     /**
-     * @ORM\ManyToOne(targetEntity="VLanProfile", inversedBy="onus", fetch="EXTRA_LAZY")
+     * @ORM\ManyToOne(targetEntity="VLanProfile", fetch="EXTRA_LAZY")
      * @ORM\JoinColumn(name="vlan_profile_id", referencedColumnName="id", onDelete="SET NULL")
      *
      * @JMS\MaxDepth(1)
@@ -247,7 +247,7 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
     protected $vlanProfile;
 
     /**
-     * @ORM\ManyToOne(targetEntity="ONUProfile", inversedBy="onus", fetch="EXTRA_LAZY")
+     * @ORM\ManyToOne(targetEntity="ONUProfile", fetch="EXTRA_LAZY")
      * @ORM\JoinColumn(name="onu_profile_id", referencedColumnName="id", onDelete="SET NULL")
      *
      * @JMS\MaxDepth(1)