MT#19113 fix voip_peer_hosts, javascript radio check

- fix voip_peer_hosts resultset selection
    - fix javascript preserving show/hide elements on form
      validate error

Change-Id: Ic6ab7569287b8864fe99c1d1bf21a13cf4954365

lib/NGCP/Panel/Controller/CallRouting.pm

@@ -73,11 +73,11 @@ sub callroutingverify :Chained('/') :PathPart('callroutingverify') :Args(0) {
         }
         $data->{caller_peer} = $rs->first;
 
-        unless ($rs->voip_peer_hosts->first) {
+        unless ($data->{caller_peer}->voip_peer_hosts->first) {
             push @log, sprintf "caller peer with id %d does not contain any peer hosts",
                 $rs->id;
         }
-        $data->{caller_peer_host} = $rs->voip_peer_hosts->first;
+        $data->{caller_peer_host} = $data->{caller_peer}->voip_peer_hosts->first;
     } else {
         push @log, sprintf "no caller subscriber/peer was specified, using subscriber lookup based on caller %s",
             $data->{caller};
@@ -292,11 +292,11 @@ sub callroutingverify :Chained('/') :PathPart('callroutingverify') :Args(0) {
         }
         $data->{callee_peer} = $rs->first;
 
-        unless ($rs->voip_peer_hosts->first) {
+        unless ($data->{callee_peer}->voip_peer_hosts->first) {
             push @log, sprintf "callee peer with id %d does not contain any peer hosts",
                 $rs->id;
         }
-        $data->{callee_peer_host} = $rs->voip_peer_hosts->first;
+        $data->{callee_peer_host} = $data->{callee_peer}->voip_peer_hosts->first;
     } else {
         push @log, sprintf "callee subscriber lookup based on %s",
             $data->{callee};

share/templates/callrouting/verify.tt

@@ -1,15 +1,20 @@
 <script type="text/javascript">
-$(document).ready(function(){
+$(document).ready(function() {
-    $("#control-caller-subscriber-id").show();
+    if ($('input[name=caller_type]:checked').attr("value") == "peer") {
-    $("#control-caller-peer-id").hide();
+        $("#control-caller-subscriber-id").hide();
+        $("#control-caller-peer-id").show();
+    } else {
+        $("#control-caller-subscriber-id").show();
+        $("#control-caller-peer-id").hide();
+    }
 
-    $('input[name$="caller_type"]').click(function(){
+    $('input[name$="caller_type"]').click(function() {
-        if($(this).attr("value")=="subscriber"){
+        if ($(this).attr("value") == "subscriber") {
             $("#control-caller-subscriber-id").show();
             $("#control-caller-peer-id").hide();
             $('div"#control-caller-type" input[type=checkbox]').prop('checked', false);
         }
-        if($(this).attr("value")=="peer"){
+        if ($(this).attr("value") == "peer") {
             $("#control-caller-subscriber-id").hide();
             $("#control-caller-peer-id").show();
             $('div"#control-caller-type" input[type=checkbox]').prop('checked', false);