From f149aa525bf9abd4913e9d6a8707c6bba27df778 Mon Sep 17 00:00:00 2001
From: Andreas Granig <agranig@sipwise.com>
Date: Wed, 3 Jul 2013 18:25:40 +0200
Subject: [PATCH] Migrate to new datatables filter method.

---
 lib/NGCP/Panel/Controller/Administrator.pm |  2 +-
 lib/NGCP/Panel/Controller/Domain.pm        |  2 +-
 lib/NGCP/Panel/Controller/NCOS.pm          |  4 ++--
 lib/NGCP/Panel/Controller/Peering.pm       |  2 +-
 lib/NGCP/Panel/Controller/Reseller.pm      | 14 +++++++-------
 lib/NGCP/Panel/Controller/Rewrite.pm       |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/NGCP/Panel/Controller/Administrator.pm b/lib/NGCP/Panel/Controller/Administrator.pm
index 84d01b72c1..4f59dfcbca 100644
--- a/lib/NGCP/Panel/Controller/Administrator.pm
+++ b/lib/NGCP/Panel/Controller/Administrator.pm
@@ -28,7 +28,7 @@ sub ajax :Chained('list_admin') :PathPart('ajax') :Args(0) {
         '/ajax_process_resultset', [
             $admins,
             [qw(id login is_master is_active read_only show_passwords call_data lawful_intercept)],
-            [ 1 ]
+            [ qw(login) ]
         ]
     );
     $c->detach($c->view('JSON'));
diff --git a/lib/NGCP/Panel/Controller/Domain.pm b/lib/NGCP/Panel/Controller/Domain.pm
index 1e4e15c5ae..316da08420 100644
--- a/lib/NGCP/Panel/Controller/Domain.pm
+++ b/lib/NGCP/Panel/Controller/Domain.pm
@@ -123,7 +123,7 @@ sub ajax :Chained('dom_list') :PathPart('ajax') :Args(0) {
     my $resultset = $self->$dispatch_to($c);
     $c->forward( "/ajax_process_resultset", [$resultset,
                  ["id", "domain"],
-                 [1]]);
+                 ["domain"]]);
     $c->detach( $c->view("JSON") );
 }
 
diff --git a/lib/NGCP/Panel/Controller/NCOS.pm b/lib/NGCP/Panel/Controller/NCOS.pm
index 6d910057c4..6dca5f4136 100644
--- a/lib/NGCP/Panel/Controller/NCOS.pm
+++ b/lib/NGCP/Panel/Controller/NCOS.pm
@@ -48,7 +48,7 @@ sub ajax :Chained('levels_list') :PathPart('ajax') :Args(0) {
     
     $c->forward( "/ajax_process_resultset", [$resultset,
                  ["id", "level", "mode", "description"],
-                 [1,2,3]]);
+                 ["level", "mode", "description"]]);
     
     $c->detach( $c->view("JSON") );
 }
@@ -169,7 +169,7 @@ sub pattern_ajax :Chained('pattern_list') :PathPart('ajax') :Args(0) {
     
     $c->forward( "/ajax_process_resultset", [$resultset,
                  ["id", "pattern", "description"],
-                 [1,2]]);
+                 ["pattern", "description"]]);
     
     $c->detach( $c->view("JSON") );
 }
diff --git a/lib/NGCP/Panel/Controller/Peering.pm b/lib/NGCP/Panel/Controller/Peering.pm
index 95c651dc26..b75f1414d5 100644
--- a/lib/NGCP/Panel/Controller/Peering.pm
+++ b/lib/NGCP/Panel/Controller/Peering.pm
@@ -34,7 +34,7 @@ sub ajax :Chained('group_list') :PathPart('ajax') :Args(0) {
     
     $c->forward( "/ajax_process_resultset", [$resultset,
                  ["id", "name", "priority", "description", "peering_contract_id"],
-                 [1,2,4]]);
+                 ["name", "priority", "description", "peering_contract_id"]]);
     
     $c->detach( $c->view("JSON") );
 }
diff --git a/lib/NGCP/Panel/Controller/Reseller.pm b/lib/NGCP/Panel/Controller/Reseller.pm
index cbfe9adf1f..784ee8517c 100644
--- a/lib/NGCP/Panel/Controller/Reseller.pm
+++ b/lib/NGCP/Panel/Controller/Reseller.pm
@@ -35,7 +35,7 @@ sub ajax :Chained('list_reseller') :PathPart('ajax') :Args(0) {
         '/ajax_process_resultset', [
             $resellers,
             [qw(id contract_id name status)],
-            [ 1, 2, 3 ]
+            [ "contract_id", "name", "status" ]
         ]
     );
     $c->detach($c->view('JSON'));
@@ -105,7 +105,7 @@ sub reseller_contacts :Chained('base') :PathPart('contacts') :Args(0) {
                 $c->stash->{resellers}->find($c->req->captures->[0])->contract_id
               )->contact_id }),
             [qw(id firstname lastname email create_timestamp)],
-            [ 1, ]
+            [ "firstname", "lastname", "email" ]
         ]
     );
     $c->detach($c->view('JSON'));
@@ -120,7 +120,7 @@ sub reseller_contracts :Chained('base') :PathPart('contracts') :Args(0) {
                 'contract', { id => $c->stash->{resellers}->find($c->req->captures->[0])->contract_id }
             ),
             [qw(id contact_id)],
-            [ 1, ]
+            [ "contact_id" ]
         ]
     );
     $c->detach($c->view('JSON'));
@@ -133,7 +133,7 @@ sub reseller_single :Chained('base') :PathPart('single') :Args(0) {
         '/ajax_process_resultset', [
             $c->stash->{resellers}->search_rs({ id => $c->req->captures->[0] }),
             [qw(id contract_id name status)],
-            [ 1, ]
+            [ "contract_id", "name", "status" ]
         ]
     );
     $c->detach($c->view('JSON'));
@@ -146,7 +146,7 @@ sub reseller_admin :Chained('base') :PathPart('admin') :Args(0) {
         '/ajax_process_resultset', [
             $c->stash->{reseller}->related_resultset('admins')->search_rs({ reseller_id => $c->req->captures->[0] }),
             [qw(id reseller_id login)],
-            [ 1, ]
+            [ "reseller_id", "login" ]
         ]
     );
     $c->detach($c->view('JSON'));
@@ -230,8 +230,8 @@ sub ajax_contract :Chained('list_reseller') :PathPart('ajax_contract') :Args(0)
     
     $c->forward("/ajax_process_resultset", [ 
         $free_contracts,
-        ["id","contact_id","external_id","status"],
-        [1,2,3]
+        ["id", "contact_id", "external_id", "status"],
+        ["contact_id", "external_id", "status"]
     ]);
     
     $c->detach( $c->view("JSON") );
diff --git a/lib/NGCP/Panel/Controller/Rewrite.pm b/lib/NGCP/Panel/Controller/Rewrite.pm
index 46c337f7d3..9aae194589 100644
--- a/lib/NGCP/Panel/Controller/Rewrite.pm
+++ b/lib/NGCP/Panel/Controller/Rewrite.pm
@@ -30,7 +30,7 @@ sub set_ajax :Chained('set_list') :PathPart('ajax') :Args(0) {
     
     $c->forward( "/ajax_process_resultset", [$resultset,
                  ["id", "name", "description"],
-                 [1,2]]);
+                 ["name", "description"]]);
     
     $c->detach( $c->view("JSON") );
 }