Reverted menu-left-example.png back to original and cleaned up menu-top-example to...

[freeside.git] / httemplate / browse / svc_acct_pop.cgi

diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 44bc651..e71a8a7 100755 (executable)
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -23,12 +23,16 @@
                                      $num_accounts_sub,
                                    ],
                   'align'       => 'rllrrrr',
+                  'links'       => [ map { $svc_acct_pop_link } (1..6) ],
           )
 %>
 <%init>
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+  unless $curuser->access_right('Dialup configuration')
+      || $curuser->access_right('Dialup global configuration');
 
 my $html_init = qq!
   <A HREF="${p}edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A>
@@ -42,7 +46,7 @@ my $query = { 'select'    => '*,
                              ',
               'table'     => 'svc_acct_pop',
               #'hashref'   => { 'disabled' => '' },
-              'extra_sql' => 'ORDER BY state, city, ac, exch, loc',
+              'order_by' => 'ORDER BY state, city, ac, exch, loc',
             };
 
 my $count_query = "SELECT COUNT(*) FROM svc_acct_pop"; # WHERE DISABLED IS NULL OR DISABLED = ''";