Merge branch '35' into 'master'

#35 onu traffic profile field is show for all brands

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

src/FTTHBundle/Admin/ONUAdmin.php

@@ -266,6 +266,23 @@ class ONUAdmin extends WorkflowBaseAdmin
                             'readonly' => $readonly,
                         ],
                     ])
+                    ->add('onuProfile', null, [
+                        'attr' => [
+                            'readonly' => $readonly,
+                        ],
+                    ])
+                    ->add('trafficProfileIn', null, [
+                        'attr' => [
+                            'readonly' => $readonly,
+                        ],
+                    ])
+                    ->add('trafficProfileOut', null, [
+                        'attr' => [
+                            'readonly' => $readonly,
+                        ],
+                    ])
+                    ->add('trafficProfileIn')
+                    ->add('trafficProfileOut')
                 ->end()
                 ->with('Huawei', ['class' => "col-md-12 {$hidden['Huawei']} olt_mark Huawei"])
                     ->add('servicePorts', CollectionType::class, array(
@@ -286,17 +303,6 @@ class ONUAdmin extends WorkflowBaseAdmin
                         ],
                     ])
                     ->add('vlanProfile', null, $optionsZTEV4)
-                    ->add('onuProfile', null, $optionsZTEV4)
-                    ->add('trafficProfileIn', null, [
-                        'attr' => [
-                            'readonly' => $readonly,
-                        ],
-                    ])
-                    ->add('trafficProfileOut', null, [
-                        'attr' => [
-                            'readonly' => $readonly,
-                        ],
-                    ])
                     ->add('tcontprofile', null, [
                         'attr' => [
                             'readonly' => $readonly,
@@ -514,7 +520,11 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('olt')
                     ->add('currentState')
                     ->add('position')
-                    ->add('ip');
+                    ->add('ip')
+                    ->add('onuProfile')
+                    ->add('trafficProfileIn')
+                    ->add('trafficProfileOut')
+                    ;
 
                     // Consulto en stats la url del detalle de onu
                     $onuShowUrl = $this->getStatsShowOnuUrl();
@@ -539,9 +549,6 @@ class ONUAdmin extends WorkflowBaseAdmin
                 ->with('ZTE', ['class' => "col-md-12 {$hidden['ZTE']} olt_mark ZTE"])
                     ->add('vlan')
                     ->add('vlanProfile', null, $optionsZTEV4)
-                    ->add('onuProfile', null, $optionsZTEV4)
-                    ->add('trafficProfileIn')
-                    ->add('trafficProfileOut')
                     ->add('tcontprofile')
                     ->add('catv')
                 ->end()