浏览代码

Ref #49. Added CATV as a common field for all marks of OLT.

Maximiliano Schvindt 6 年之前
父节点
当前提交
a05044592d
共有 2 个文件被更改,包括 9 次插入3 次删除
  1. 8 3
      src/FTTHBundle/Admin/ONUAdmin.php
  2. 1 0
      src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

+ 8 - 3
src/FTTHBundle/Admin/ONUAdmin.php

@@ -290,6 +290,7 @@ class ONUAdmin extends WorkflowBaseAdmin
                             'readonly' => $readonly,
                         ],
                     ])
+                    ->add('catv')
                 ->end()
                 ->with('Huawei', ['class' => "col-md-12 {$hidden['Huawei']} olt_mark Huawei"])
                     ->add('servicePorts', CollectionType::class, array(
@@ -318,7 +319,6 @@ class ONUAdmin extends WorkflowBaseAdmin
                             'readonly' => $readonly,
                         ],
                     ])
-                    ->add('catv')
                 ->end()
                 ->with("FiberLink | FiberHome", ['class' => "col-md-12 olt_mark FiberLink FiberHome"])
                     ->add('vlans', null, array(
@@ -342,7 +342,8 @@ class ONUAdmin extends WorkflowBaseAdmin
                 'ponSerialNumberAux' => $this->trans("helps.onu_pon_serial_number_aux"),
                 'servicePorts' => $this->trans("helps.service_port"),
                 'mac' => $this->trans("helps.mac"),
-                'radiusAuth' => $this->trans("helps.radiusAuth")
+                'radiusAuth' => $this->trans("helps.radiusAuth"),
+                'catv' => $this->trans("helps.catv")
             ));
 
 
@@ -535,6 +536,7 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('onuProfile')
                     ->add('trafficProfileIn')
                     ->add('trafficProfileOut')
+                    ->add('catv')
                     ;
 
                     // Consulto en stats la url del detalle de onu
@@ -561,7 +563,6 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('vlan')
                     ->add('vlanProfile', null, $optionsZTEV4)
                     ->add('tcontprofile')
-                    ->add('catv')
                 ->end()
                 ->with('FiberLink', ['class' => "col-md-12 {$hidden['FiberLink']} olt_mark FiberLink"])
                     ->add('vlans', null, array(
@@ -773,6 +774,10 @@ class ONUAdmin extends WorkflowBaseAdmin
         if($tcontprofile = $template->getTcontprofile()) {
             $form->add('tcontprofile', null, array('data' => $tcontprofile));
         }
+        
+        if($catv = $template->getCatv()) {
+            $form->add('catv', null, array('data' => $catv));
+        }
 
         if($vlans = $template->getVlans()) {
             $form->add('vlans', null, array('data' => $vlans));

+ 1 - 0
src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

@@ -367,6 +367,7 @@ helps:
     profile_upload: Expresado en bits
     profile_download: Expresado en bits
     profile_template: Template a utilizar para gestión de radius
+    catv: Utilizado para habilitar/deshabilitar CATV en la ONU conectada a OLT ZTE o Huawei (algunos modelos).
 error:
     address_not_found: La dirección "%client_address%" no fue encontrada en los servicios de google.
     nap_relation_olt_not_found: No se encontró la relación entre el nap y la olt.