[freeside-commits] branch master updated. ae2ce7f3fc2a0fe00f05145ce64e8b6b8c034631

Ivan ivan at 420.am
Fri Oct 21 12:11:18 PDT 2016


The branch, master has been updated
       via  ae2ce7f3fc2a0fe00f05145ce64e8b6b8c034631 (commit)
      from  ade06c71a2159e9079951c00662843455b01a5d8 (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 ae2ce7f3fc2a0fe00f05145ce64e8b6b8c034631
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Oct 21 12:11:18 2016 -0700

    multi-select for agent on RADIUS usage report, RT#73050

diff --git a/httemplate/search/sqlradius_usage.html b/httemplate/search/sqlradius_usage.html
index 6b1806e..494a275 100644
--- a/httemplate/search/sqlradius_usage.html
+++ b/httemplate/search/sqlradius_usage.html
@@ -74,12 +74,16 @@ if ( $opt{'agentnum'} =~ /^(\d+)$/ ) {
   my @agentnums = grep /^(\d+)$/, $cgi->param('agentnum');
 
   if ( ! @agentnums ) {
-    @include_agents = qsearch('agent', {});
+    @include_agents = qsearch({ 'table'     => 'agent',
+                                'hashref'   => { 'disabled'=>'' },
+                                'extra_sql' => ' AND '. $curuser->agentnums_sql,
+                             });
   } elsif ( scalar(@agentnums) == 1 ) {
     $agentnum = $agentnums[0];
   } else {
     @include_agents = qsearch({ 'table'     => 'agent',
-                                'extra_sql' => 'WHERE agentnum IN ('.
+                                'hashref'   => { 'disabled' => '', },
+                                'extra_sql' => 'AND agentnum IN ('.
                                                  join(',', at agentnums). ') '.
                                                ' AND '. $curuser->agentnums_sql,
                              });

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

Summary of changes:
 httemplate/search/sqlradius_usage.html |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list