X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fconfig%2Fconfig-view.cgi;h=e7cadbe9938e78e4be6352179641e12dcf0264e9;hb=3d2e1d9b5d1883f768f5a90e0dfaae7cc9a41367;hp=80a65d09b7c2fc43104cca4f63de5501d4f7aa85;hpb=81e426fe755eaea508041bc2d7b25ac44c777434;p=freeside.git

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 80a65d09b..e7cadbe99 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -43,12 +43,16 @@ Click on a configuration value to change it.
   <TABLE BGCOLOR="#cccccc" BORDER=1 CELLSPACING=0 CELLPADDING=0 BORDERCOLOR="#999999">
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
-      <% ucfirst($section || 'unclassified') %> configuration options
+      <% ucfirst($section || 'unclassified') %>
+%     if ( $curuser->option('show_confitem_counts') ) {
+        (<% scalar( @{ $section_items{$section} } ) %> items)
+%     }
     </th>
   </tr>
 % foreach my $i (@{ $section_items{$section} }) { 
 %   my @types = ref($i->type) ? @{$i->type} : ($i->type);
-%   my( $width, $height ) = ( 522, 336 );
+%#  my( $width, $height ) = ( 522, 336 );
+%   my( $width, $height ) = ( 600, 336 );
 %   if ( grep $_ eq 'textarea', @types ) {
 %     #800x600
 %     $width = 763;
@@ -203,19 +207,35 @@ Click on a configuration value to change it.
 
             <tr>
               <td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff">
+%               if ( $i->multiple ) {
+                    <% join('<BR>',
+                        map { $_ . ": " . &{ $i->option_sub }($_) }
+                                            $conf->config($i->key,$agentnum)
+                        )
+                    %>
+%               } else {
                 <% $conf->config($i->key, $agentnum) %>: 
                 <% &{ $i->option_sub }( $conf->config($i->key, $agentnum) ) %>
+%               }
               </td>
             </tr>
 
-%   } elsif ( $type eq 'select-part_svc' ) {
-%     my @svcparts = $conf->config($i->key, $agentnum);
+%   } elsif ( $type =~ /^select-(part_svc|part_pkg|pkg_class|agent)$/ ) {
+%
+%     my $table = $1;
+%     my $namecol = $namecol{$table};
+%     my $pkey = dbdef->table($table)->primary_key;
+%
+%     my @keys = $conf->config($i->key, $agentnum);
 
             <tr>
               <td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff">
-                <% join('<BR>', map { $_ # ': '. $svc
-                                    }
-                                    @svcparts
+                <% join( '<BR>',
+                         map {
+                           my $key = $_;
+                           my $record = qsearchs($table, { $pkey => $key });
+                           $record ? "$key: ".$record->$namecol() : $key;
+                         } @keys
                        )
                 %>
               </td>
@@ -300,10 +320,20 @@ Click on a configuration value to change it.
 </SCRIPT>
 
 </body></html>
+<%once>
+#false laziness w/config-process.cgi
+my %namecol = (
+  'part_svc'  => 'svc',
+  'part_pkg'  => 'pkg',
+  'pkg_class' => 'classname',
+  'agent'     => 'agent',
+);
+</%once>
 <%init>
 
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied" unless $curuser->access_right('Configuration');
 
 my $page_agent = '';
 my $title;
@@ -328,7 +358,7 @@ my @config_items = grep { $page_agent ? $_->per_agent : 1 }
 my @deleteable = qw( invoice_latexreturnaddress invoice_htmlreturnaddress );
 my %deleteable = map { $_ => 1 } @deleteable;
 
-my @sections = qw(required billing username password UI session shell BIND );
+my @sections = qw(required billing invoicing notification UI self-service ticketing username password session shell BIND telephony );
 push @sections, '', 'deprecated';
 
 my %section_items = ();
@@ -342,6 +372,5 @@ my @all_agents = ();
 if ( $cgi->param('showagent') ) {
   @all_agents = qsearch('agent', { 'disabled' => '' } );
 }
-warn 'all agents: '. join('-', @all_agents);
 
 </%init>