[freeside-commits] freeside/httemplate/config config-process.cgi, 1.12, 1.13 config-view.cgi, 1.18, 1.19 config.cgi, 1.22, 1.23

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/config
In directory wavetail:/tmp/cvs-serv23435/httemplate/config

Modified Files:
	config-process.cgi config-view.cgi config.cgi 
Log Message:
event refactor, landing on HEAD!

Index: config.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config.cgi,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- config.cgi	18 Jul 2007 18:07:38 -0000	1.22
+++ config.cgi	1 Aug 2007 22:25:00 -0000	1.23
@@ -267,11 +267,15 @@
 </BODY>
 </HTML>
 <%once>
+
 my $conf = new FS::Conf;
-my %confitems = map { $_->key => $_ } $conf->config_items;
-</%once>
+my @config_items = grep { $_->key != ~/^invoice_(html|latex|template)/ }
+                        $conf->config_items; 
+my %confitems = map { $_->key => $_ } @config_items;
 
+</%once>
 <%init>
+
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 

Index: config-view.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-view.cgi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- config-view.cgi	19 Jul 2007 14:05:41 -0000	1.18
+++ config-view.cgi	1 Aug 2007 22:25:00 -0000	1.19
@@ -38,7 +38,7 @@
 % } 
 
   </FONT><BR>
-  <% table("#cccccc", 2) %>
+  <% include('/elements/table.html', '#cccccc' ) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
       <% ucfirst($section || 'unclassified') %> configuration options
@@ -114,15 +114,16 @@
 
 </body></html>
 <%init>
+
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-my ($conf, $title, @config_items, $agentnum);
-
+my $agentnum = '';
 if ($cgi->param('agentnum') =~ /^(\d+)$/) {
   $agentnum = $1;
 }
 
+my $title;
 if ($agentnum) {
   my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
   die "Agent $agentnum not found!" unless $agent;
@@ -132,7 +133,10 @@
   $title = 'Global Configuration';
 }
 
-$conf = new FS::Conf;
- at config_items = grep { $agentnum ? $_->per_agent : 1 } $conf->config_items; 
-
+my $conf = new FS::Conf;
+ 
+my @config_items = grep { $agentnum ? $_->per_agent : 1 }
+                   grep { $_->key != ~/^invoice_(html|latex|template)/ }
+                        $conf->config_items; 
+ 
 </%init>

Index: config-process.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-process.cgi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- config-process.cgi	18 Jul 2007 18:07:38 -0000	1.12
+++ config-process.cgi	1 Aug 2007 22:25:00 -0000	1.13
@@ -4,7 +4,8 @@
 
 my $conf = new FS::Conf;
 $FS::Conf::DEBUG = 1;
-my @config_items = $conf->config_items;
+my @config_items = grep { $_->key != ~/^invoice_(html|latex|template)/ }
+                        $conf->config_items;
 my %confitems = map { $_->key => $_ } $conf->config_items;
 
 my $agentnum = $cgi->param('agentnum');