From 68436b044da99d393d5a861490a41c8d9443b7b8 Mon Sep 17 00:00:00 2001
From: Irina Peshinskaya <ipeshinskaya@sipwise.com>
Date: Thu, 11 Apr 2019 11:32:17 +0200
Subject: [PATCH] TT#55366 Fix strings comparison in datatable multifield

+ use table specific checked_fields for cases when page has some datatable_multified fields

Change-Id: I6e943d33787e5cdfc0d47290bb988d9eed6c8a19
---
 lib/NGCP/Panel/Utils/Subscriber.pm               | 11 +++++------
 share/templates/helpers/datatables_multifield.tt | 16 +++++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/NGCP/Panel/Utils/Subscriber.pm b/lib/NGCP/Panel/Utils/Subscriber.pm
index e8c1f01f2e..3ee33ca32a 100644
--- a/lib/NGCP/Panel/Utils/Subscriber.pm
+++ b/lib/NGCP/Panel/Utils/Subscriber.pm
@@ -1536,14 +1536,13 @@ sub prepare_group_select {
     my $subscriber = $p{subscriber};
     my $params = $p{params};
     my $unselect = $p{unselect} // 0;
-
     my @group_options = ();
-    my $group_rs = $c->model('DB')->resultset('voip_pbx_groups')->search({
-        'subscriber_id' => $subscriber->provisioning_voip_subscriber->id,
-    },{
-        'order_by' => 'me.id',
-    });
     unless($unselect) {
+        my $group_rs = $c->model('DB')->resultset('voip_pbx_groups')->search({
+            'subscriber_id' => $subscriber->provisioning_voip_subscriber->id,
+        },{
+            'order_by' => 'me.id',
+        });
         @group_options = map { $_->group->voip_subscriber->id } $group_rs->all;
     }
     $params->{group_select} = encode_json(\@group_options);
diff --git a/share/templates/helpers/datatables_multifield.tt b/share/templates/helpers/datatables_multifield.tt
index 5a672855ed..e630b65458 100644
--- a/share/templates/helpers/datatables_multifield.tt
+++ b/share/templates/helpers/datatables_multifield.tt
@@ -1,28 +1,30 @@
 <!-- datatables_multifield -->
 <script type="text/javascript">
 
-var checked_fields = [];
+var checked_fields[%table_id%] = [];
 $(document).ready(function() {
 
     [%IF value%]
     JSON.parse('[% value %]').map( function (val) {
-        checked_fields.push(val);
+        //force string type for the correct comparison with $(nRow).find("td:first").text() below
+        val = '' + val;
+        checked_fields[%table_id%].push(val);
     });
     [%END%]
     $('#[% table_id %] tr td input[type="checkbox"]').live( "click", function() {
 
         var my_id = $(this).parents("tr").find("td:first").text();
-        var indexOfId = checked_fields.indexOf(my_id)
+        var indexOfId = checked_fields[%table_id%].indexOf(my_id)
         if($(this).attr("checked") == "checked") {
             if(indexOfId < 0){
-               checked_fields.push(my_id);
+               checked_fields[%table_id%].push(my_id);
             }
         } else {
             if( indexOfId >= 0){
-                checked_fields.splice(indexOfId,1);
+                checked_fields[%table_id%].splice(indexOfId,1);
             }
         }
-        $("#[% hidden_id %]").val( JSON.stringify(checked_fields) );
+        $("#[% hidden_id %]").val( JSON.stringify(checked_fields[%table_id%]) );
 
     });
     $('#[% table_id %]')
@@ -67,7 +69,7 @@ $(document).ready(function() {
         ],
         "fnRowCallback": function(nRow, aData, iDisplayIndex) {
             nRow.className = "sw_action_row";
-            if(checked_fields.indexOf($(nRow).find("td:first").text()) >= 0 )
+            if(checked_fields[%table_id%].indexOf($(nRow).find("td:first").text()) >= 0 )
             {
                 $(nRow).find("td input[type='checkbox']").attr("checked", "checked");
             }