[freeside-commits] branch master updated. 05364e1a107233d35792a76bf6d23d00dd5611cf

[Brian Medley]

The branch, master has been updated
       via  05364e1a107233d35792a76bf6d23d00dd5611cf (commit)
       via  a502263ac279815f164ba2abfffec919c6250dcb (commit)
      from  be368a6ee2dca0ddd4aa53c0b912e09498bef24a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 05364e1a107233d35792a76bf6d23d00dd5611cf
Merge: a502263 be368a6
Author: Brian Medley <bpm at snafu.org>
Date:   Tue Apr 24 07:40:14 2012 -0500

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit a502263ac279815f164ba2abfffec919c6250dcb
Author: Brian Medley <bpm at snafu.org>
Date:   Tue Apr 24 07:40:00 2012 -0500

    add in access_right checks for sub menues, #17056

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index b1cbebf..0f36500 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -221,7 +221,8 @@ foreach my $svcdb ( FS::part_svc->svc_tables() ) {
 
   }
 
-  $report_services{$name} = [ \%report_svc, $longname ];
+  $report_services{$name} = [ \%report_svc, $longname ] if
+    $curuser->access_right("Services: $name");
 
 }
 
@@ -253,14 +254,15 @@ tie my %report_inventory, 'Tie::IxHash',
   'Inventory activity' => [ $fsurl.'search/report_h_inventory_item.html', '' ],
 ;
 
-tie my %report_rating, 'Tie::IxHash',
-  'RADIUS sessions' => [ $fsurl.'search/sqlradius.html', '' ],
-  'Call Detail Records (CDRs)' => [ $fsurl.'search/report_cdr.html', '' ],
-  'Unrateable CDRs' => [ $fsurl.'search/cdr.html?freesidestatus=failed'.
-                                               ';cdrbatchnum=_ALL_' ],
-  'Time worked' => [ $fsurl.'search/report_rt_transaction.html', '' ],
-  'Time worked summary' => [ $fsurl.'search/report_rt_ticket.html', '' ],
-;
+my @report_rating = ();
+push(@report_rating, 'RADIUS sessions' => [ $fsurl.'search/sqlradius.html', '' ]) if $curuser->access_right("Usage: RADIUS sessions");
+push(@report_rating, 'Call Detail Records (CDRs)' => [ $fsurl.'search/report_cdr.html', '' ]) if $curuser->access_right("Usage: Call Detail Records (CDRs)");
+push(@report_rating, 'Unrateable CDRs' => [ $fsurl.'search/cdr.html?freesidestatus=failed'.
+    ';cdrbatchnum=_ALL_' ]) if $curuser->access_right("Usage: Unrateable CDRs");
+push(@report_rating, 'Time worked' => [ $fsurl.'search/report_rt_transaction.html', '' ]) if $curuser->access_right("Usage: Time worked");
+push(@report_rating, 'Time worked summary' => [ $fsurl.'search/report_rt_ticket.html', '' ]) if $curuser->access_right("Usage: Time worked summary");
+
+tie my %report_rating, 'Tie::IxHash', @report_rating;
 
 tie my %report_ticketing_statistics, 'Tie::IxHash',
   'Tickets per day per Queue'         => [ $fsurl.'rt/RTx/Statistics/CallsQueueDay', 'View the number of tickets created, resolved or deleted in a specific Queue, over the requested period of days' ],

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/menu.html |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)