X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fconfig%2Fconfig-view.cgi;h=5f09b128a383fcc6e6f531039a5c2341d41dbc11;hp=0f6c99232f7796da0dc5b7ce62d86edb5e427a34;hb=HEAD;hpb=56a2965996454a0649d43ecbc062beda61106e21 diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi index 0f6c99232..5f09b128a 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -7,7 +7,7 @@ Click on a configuration value to change it. % % if ( $cgi->param('showagent') ) { % $cgi->param('showagent', 0); - ( hide agent overrides ) + ( show global configuration ) % $cgi->param('showagent', 1); % } else { % $cgi->param('showagent', 1); @@ -16,6 +16,38 @@ Click on a configuration value to change it. % } % % } +% if ( @locales ) { +( +% if ( $locale ) { +% $cgi->delete('locale'); + global settings | +% } + +invoice language options: +
+<& /elements/select.html, + 'field' => 'locale', + 'options' => [ '', grep { $_ ne 'en_US'} @locales ], + 'labels' => { map { + my %info = FS::Locales->locale_info($_); + $_ => "$info{name} ($info{country})" + } grep { $_ ne 'en_US' } @locales }, + 'curr_value' => $locale, + 'id' => 'select-locale', + 'onchange' => 'changeLocale' + &> + ) +% $cgi->param('locale', $locale); +% } +
+

<% include('/elements/init_overlib.html') %> @@ -26,29 +58,37 @@ Click on a configuration value to change it. % foreach my $section (@sections) { - + % foreach my $nav_section (@sections) { % % if ( $section eq $nav_section ) { - [<% ucfirst($nav_section || 'unclassified') %>] + <% section_title($nav_section) %> % } else { - [<% ucfirst($nav_section || 'unclassified') %>] + <% section_title($nav_section) %> % } % +% unless ( $nav_section eq $sections[-1] ) { + | +% } +% % }
% 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; @@ -78,26 +118,35 @@ Click on a configuration value to change it. % foreach my $agent ( @agents ) { % my $agentnum = $agent ? $agent->agentnum : ''; % -% next if $section eq 'deprecated' && ! $conf->exists($i->key, $agentnum); +% next if $section eq 'deprecated' +% && ( ! $conf->exists($i->key, $agentnum) +% || $conf->config($i->key, $agentnum) eq '' +% ); % % my $label = $i->key; % $label = '['. $agent->agent. "] $label" % if $agent && $cgi->param('showagent'); % % #indentation :/ +% my $action = 'config.cgi?key=' . $i->key . +% ";agentnum=$agentnum" . ($locale ? ";locale=$locale" : ''); - % } elsif ( $type eq 'image' ) { +% my $args = 'key=' . $i->key . ";agentnum=$agentnum;locale=$locale"; @@ -137,18 +186,19 @@ Click on a configuration value to change it. % } elsif ( $type eq 'binary' ) { +% my $args = 'key=' . $i->key . ";agentnum=$agentnum;locale=$locale"; @@ -156,22 +206,28 @@ Click on a configuration value to change it. % } elsif ( $type eq 'textarea' % || $type eq 'editlist' -% || $type eq 'selectmultiple' ) { +% || $type eq 'selectmultiple' +% ) +% { % } elsif ( $type eq 'checkbox' ) { - + % } elsif ( $type eq 'select' && $i->select_hash ) { @@ -197,21 +253,50 @@ Click on a configuration value to change it. -% } elsif ( $type eq 'select-sub' ) { +% } elsif ( $type eq 'select-sub' ) { -% } else { +% } 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); + + + + + +% } else { -% } +% } % $n++; % } @@ -223,7 +308,7 @@ Click on a configuration value to change it. % if ( @add_agents ) { -
- <% ucfirst($section || 'unclassified') %> configuration options + <% section_title($section) %> +% if ( $curuser->option('show_confitem_counts') ) { + (<% scalar( @{ $section_items{$section} } ) %> items) +% }
<% include('/elements/popup_link.html', - 'action' => 'config.cgi?key='. $i->key. - ';agentnum='. $agentnum, - 'width' => $width, - 'height' => $height, - 'actionlabel' => 'Enter configuration value', - 'label' => "$label", - 'aname' => $i->key, #agentnum - # if $cgi->param('showagent')? +% unless ( $cgi->param('showagent') ) { + + <% include('/elements/popup_link.html', + 'action' => $action, + 'width' => $width, + 'height' => $height, + 'actionlabel' => 'Enter configuration value', + 'html_label' => "$label", + 'aname' => $i->key, ) - %>: <% $i->description %> + %>: +% } else { + <% $label %>: +% } + <% $i->description %> % if ( $agent && $cgi->param('showagent') ) { % my $confnum = $conf->conf( $i->key, $agent->agentnum, 1 )->confnum; (delete agent override) @@ -124,12 +173,12 @@ Click on a configuration value to change it.
<% $conf->exists($i->key, $agentnum) - ? '' + ? '' : 'empty' %>
<% $conf->exists($i->key, $agentnum) - ? qq!download! + ? 'download' : '' %>
<% $conf->exists($i->key, $agentnum) - ? qq!download! + ? 'download' : 'empty' %>
-
<% encode_entities(join("\n",
-     map { length($_) > 88 ? substr($_,0,88).'...' : $_ }
-         $conf->config($i->key, $agentnum)
-   ) )
-%>
+ +% my $escaped = eval { encode_entities(join("\n", +% map { length($_) > 88 ? substr($_,0,88).'...' : $_ } +% $conf->config($i->key, $agentnum) +% ) ); +% }; +% $escaped = $@ ? '('.encode_entities($@).')' : $escaped; +
<% $escaped %>
+
YES' : 'ff0000">NO' %>YES' : 'ff0000">NO' %>
+% if ( $i->multiple ) { + <% join('
', + map { $_ . ": " . &{ $i->option_sub }($_) } + $conf->config($i->key,$agentnum) + ) + %> +% } else { <% $conf->config($i->key, $agentnum) %>: <% &{ $i->option_sub }( $conf->config($i->key, $agentnum) ) %> +% }
+ <% join( '
', + map { + my $key = $_; + my $record = qsearchs($table, { $pkey => $key }); + $record ? "$key: ".$record->$namecol() : $key; + } @keys + ) + %> +
unknown type <% $type %>
+
Add <% $i->key %> override for <% include('/elements/select-agent.html', @@ -285,10 +370,20 @@ Click on a configuration value to change it. +<%once> +#false laziness w/config-process.cgi +my %namecol = ( + 'part_svc' => 'svc', + 'part_pkg' => 'pkg', + 'pkg_class' => 'classname', + 'agent' => 'agent', +); + <%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; @@ -299,22 +394,62 @@ if ($cgi->param('agentnum') =~ /^(\d+)$/) { die "Agent $page_agentnum not found!" unless $page_agent; push @menubar, 'View all agents' => $p.'browse/agent.cgi'; +} + +my $conf = new FS::Conf; +my $conf_global = $conf; + +my @locales = $conf_global->config('available-locales'); + +# if this is set, we are in locale mode, so limit the displayed items +# to those with per_locale. +my $locale; +my $locale_desc; +if ( $cgi->param('locale') =~ /^\w+_\w+$/ ) { + $locale = $cgi->param('locale'); + # and set the context on $conf + $conf = new FS::Conf { 'locale' => $locale, 'localeonly' => 1 }; + my %locale_info = FS::Locales->locale_info($locale); + $locale_desc = "$locale_info{name} ($locale_info{country})"; + + $title = 'Invoice Configuration'; #for now it is only invoicing + $title .= ' for '.$page_agent->agent if $page_agent; + $title .= ', '.$locale_desc; + +} elsif ($page_agent) { $title = 'Agent Configuration for '. $page_agent->agent; + $title .= ", $locale_desc" if $locale; +} elsif ( $cgi->param('showagent') ) { + $title = 'Agent Configuration Overrides' } else { $title = 'Global Configuration'; } -my $conf = new FS::Conf; - -my @config_items = grep { $page_agent ? $_->per_agent : 1 } - grep { $page_agent ? 1 : !$_->agentonly } +my $show_over = $page_agent || $cgi->param('showagent'); + +my @config_items = grep { !defined($locale) or $_->per_locale } + grep { $show_over ? $_->per_agent : 1 } + grep { $show_over ? 1 : !$_->agentonly } $conf->config_items; my @deleteable = qw( invoice_latexreturnaddress invoice_htmlreturnaddress ); my %deleteable = map { $_ => 1 } @deleteable; -my @sections = qw(required billing username password UI session shell BIND ); -push @sections, '', 'deprecated'; +my @sections = (qw( + important + billing payments payment_batching credit_cards e-checks taxation + packages suspension cancellation + printing print_services email_to_voice_services + invoicing invoice_email invoice_balances invoice_templates quotations + notification UI addresses customer_number customer_fields reporting + localization scalability backup + signup self-service self-service_skinning + API ticketing appointments network_monitoring + services + username password + telephony telephony_invoicing RADIUS wireless_broadband shell BIND hosting + ), '', qw( development deprecated ) +); my %section_items = (); foreach my $section (@sections) { @@ -327,6 +462,11 @@ my @all_agents = (); if ( $cgi->param('showagent') ) { @all_agents = qsearch('agent', { 'disabled' => '' } ); } -warn 'all agents: '. join('-', @all_agents); + +sub section_title { + my $sec = ucfirst(shift || 'misc'); + $sec =~ s/_/ /; + $sec; +}