浏览代码

vlans required para FiberHome. Se agrega 'if' para capturar 'mark:ERROR'

Maximiliano Schvindt 6 年之前
父节点
当前提交
2b450e67fc
共有 2 个文件被更改,包括 19 次插入7 次删除
  1. 1 1
      src/FTTHBundle/Admin/ONUAdmin.php
  2. 18 6
      src/FTTHBundle/Resources/views/ONU/form.html.twig

+ 1 - 1
src/FTTHBundle/Admin/ONUAdmin.php

@@ -239,7 +239,7 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('tcontprofile')
                     ->add('catv')
                 ->end()
-                ->with('FiberLink', ['class' => "col-md-12 {$hidden['FiberLink']} olt_mark FiberLink"])
+                ->with("FiberLink | FiberHome", ['class' => "col-md-12 olt_mark FiberLink FiberHome"])
                     ->add('vlans', null, array(
                         'required' => false,
                         'multiple' => true,

+ 18 - 6
src/FTTHBundle/Resources/views/ONU/form.html.twig

@@ -78,13 +78,25 @@
                     id: olt
                 },
                 success: function (result) {
-                    $('.olt_mark').addClass('hidden');
-                    $('.' + result.mark).removeClass('hidden');
+                    if(result.mark !== 'ERROR') {
+                        $('.olt_mark').addClass('hidden');
+                        $('.' + result.mark).removeClass('hidden');
+                        $("div." + result.mark + " div div.box-header h4.box-title").html(result.mark);
 
-                    $('.zte_v4').addClass('hidden');
-                    // El modelo de OLT es ZTE V4, entonces muestro los campos
-                    if (result.name.includes('ZTE') && result.name.includes('V4')) {
-                        $('.zte_v4').removeClass('hidden');
+                        // FiberHome and FiberLink have vlans but in FiberHome vlans is required (at least vlanid_data)
+                        if(result.mark === 'FiberHome') {
+                            $('#{{ admin.uniqid ~ "_vlans" }}').attr('required',true)
+                            $("label[for='{{ admin.uniqid ~ '_vlans' }}']").addClass('required');
+                        } else {
+                            $('#{{ admin.uniqid ~ "_vlans" }}').attr('required',false)
+                            $("label[for='{{ admin.uniqid ~ '_vlans' }}']").removeClass('required');
+                        }
+                        
+                        $('.zte_v4').addClass('hidden');
+                        // El modelo de OLT es ZTE V4, entonces muestro los campos
+                        if (result.name.includes('ZTE') && result.name.includes('V4')) {
+                            $('.zte_v4').removeClass('hidden');
+                        }
                     }
                 }
             });