[freeside-commits] freeside/httemplate/config config-view.cgi, 1.30, 1.31

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/config
In directory wavetail.420.am:/tmp/cvs-serv30550

Modified Files:
	config-view.cgi 
Log Message:
add ability to delete invoice_latexreturnaddress and invoice_htmlreturnaddress too, RT#5218

Index: config-view.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-view.cgi,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- config-view.cgi	3 May 2009 01:11:50 -0000	1.30
+++ config-view.cgi	3 May 2009 01:45:09 -0000	1.31
@@ -100,7 +100,8 @@
 %         my $confnum =
 %           _config_agentonly($conf, $i->key, $agent->agentnum)->confnum;
           (<A HREF="javascript:areyousure('delete this agent override', 'config-delete.cgi?confnum=<% $confnum %>;redirect=config_view_showagent')">delete agent override</A>)
-%       } elsif ( $i->base_key ) {
+%       } elsif ( $i->base_key
+%                 || ( $deleteable{$i->key} && $conf->exists($i->key) ) ) {
 %         my $confnum =
 %           $agent
 %             ? _config_agentonly($conf, $i->key, $agent->agentnum)->confnum
@@ -319,6 +320,9 @@
 my @config_items = grep { $page_agent ? $_->per_agent : 1 }
                         $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';