From 4c5b427c464cec59aef3374f445ed281609f3505 Mon Sep 17 00:00:00 2001
From: Daniel Tiefnig <dtiefnig@sipwise.com>
Date: Mon, 8 Mar 2010 00:26:30 +0000
Subject: [PATCH] added primary number to subscriber lists added registered
 contacts to account subscriber list

---
 lib/admin/Controller/account.pm | 11 +++++++++++
 root/tt/account_detail.tt       |  7 ++++++-
 root/tt/subscriber.tt           | 11 ++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/lib/admin/Controller/account.pm b/lib/admin/Controller/account.pm
index a8ee201..6dbe673 100644
--- a/lib/admin/Controller/account.pm
+++ b/lib/admin/Controller/account.pm
@@ -164,6 +164,17 @@ sub detail : Local {
             or ref $c->session->{voip_account}{subscribers} ne 'ARRAY'
             or $#{$c->session->{voip_account}{subscribers}} == -1;
 
+    foreach my $vas (eval { @{$c->session->{voip_account}{subscribers}} }) {
+        my $regcon;
+        return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_registered_contacts',
+                                                            { username => $$vas{username},
+                                                              domain   => $$vas{domain},
+                                                            },
+                                                            \$regcon
+                                                          );
+        $$vas{registered_contacts} = join ", ", map { $$_{user_agent} } @$regcon if eval { @$regcon };
+    }
+
     $c->stash->{account} = $c->session->{voip_account};
     $c->stash->{account}{is_locked} = 1 if $c->session->{voip_account}{status} eq 'locked';
 
diff --git a/root/tt/account_detail.tt b/root/tt/account_detail.tt
index 822ade4..761931b 100644
--- a/root/tt/account_detail.tt
+++ b/root/tt/account_detail.tt
@@ -176,6 +176,11 @@
         <div class="p1">
         [% IF account.subscribers %]
           <table>
+            <tr class="table_header">
+              <td>SIP URI</td>
+              <td>Primary Number</td>
+              <td>Registered Devices</td>
+            </tr>
           [% FOREACH subscriber = account.subscribers %]
             <tr>
               <td>
@@ -187,7 +192,7 @@
               [% END %]
               </td>
               <td>[% IF subscriber.sn %]+[% subscriber.cc %] [% subscriber.ac %] [% subscriber.sn %][% END %]</td>
-              <td>[% subscriber.uuid %]</td>
+              <td>[% subscriber.registered_contacts %]</td>
             </tr>
           [% END %]
           </table>
diff --git a/root/tt/subscriber.tt b/root/tt/subscriber.tt
index 2d26e97..bf1b36b 100644
--- a/root/tt/subscriber.tt
+++ b/root/tt/subscriber.tt
@@ -37,7 +37,11 @@
 
           <div class="p1">
             <table>
-              <tr class="table_header"><td>SIP URI</td><td class="tdcenter">Account ID</td></tr>
+              <tr class="table_header">
+                <td>SIP URI</td>
+                <td class="tdcenter">Account ID</td>
+                <td>Primary Number</td>
+              </tr>
 
             [% FOREACH subscriber = subscriber_list %]
 
@@ -54,6 +58,11 @@
                   <a href="/account/detail?account_id=[% subscriber.account_id %]">
                     [% subscriber.account_id %]</a>
                 </td>
+                <td>
+                  [% IF subscriber.sn %]
+                    +[% subscriber.cc %] [% subscriber.ac %] [% subscriber.sn %]
+                  [% END %]
+                </td>
               </tr>
 
             [% END %]