[Rt-commit] r6181 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Tue Oct 10 06:30:50 2006
New Revision: 6181

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Tools/Configuration.html

Log:
 r3919 at cubic-pc:  cubic | 2006-10-10 14:40:53 +0400
 System Configuration tool
 * don't show config options twice


Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Tools/Configuration.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Tools/Configuration.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Tools/Configuration.html	Tue Oct 10 06:30:50 2006
@@ -60,14 +60,11 @@
 
 
 
-
 <h2><&|/l&>Loaded perl modules</&></h2>
+% my $report = Module::Versions::Report::report();
+% my @report = grep /v\d/, split("\n",$report);
 <pre>
-% my $report =  Module::Versions::Report::report();
-% my @report = grep { /v\d/ } split("\n",$report);
-<%join('<br />', @report)|n%>
-
-
+<% join('<br />', @report) |n %>
 </pre>
 
 <h2><&|/l&>RT Config</&></h2>
@@ -79,8 +76,7 @@
 <td>
 % if ( $key =~ /Password(?!Length)/i ) { 
 <em>Password not printed</em>
-% } else {
-% unless ( ref $val ) {
+% } elsif ( !ref $val ) {
 <% $val %>
 % } elsif ( ref $val eq 'ARRAY' ) {
 <% join ', ', @$val %>
@@ -89,35 +85,31 @@
 % } else {
 <% ref $val %>
 % }
-% }
-</td>
-</tr>
+</td></tr>
 % }
 </table>
 
 <h2><&|/l&>RT Variables</&></h2>
 <table>
-%{
-%no strict qw/refs/;
-
-%foreach my $key (sort keys %{*RT::}) {
-% next unless ${'RT::'.$key};
-% next if ref ${'RT::'.$key};
-<tr><td>RT::<%$key%></td>
+% { no strict qw/refs/;
+% my %config_opt = map { $_ => 1 } RT->Config->Options( Overridable => undef );
+% foreach my $key ( sort keys %{*RT::} ) {
+% next if !${'RT::'.$key} || ref ${'RT::'.$key} || $config_opt{ $key };
+<tr><td>RT::<% $key %></td>
 <td>
-% if ($key =~ /Password(?!Length)/i) { 
+% if ( $key =~ /Password(?!Length)/i ) { 
 <em>Password not printed</em>
 % } else {
-<%${'RT::'.$key} %>
+<% ${'RT::'.$key} %>
 % }
 </td>
 </tr>
 % }
-%}
+% }
 </table>
 
 <h2><&|/l&>Perl configuration</&></h2>
 % require Config;
 <pre>
-<%Config::myconfig()%>
+<% Config::myconfig() %>
 </pre>