Item11528: Hide irrelevant configure options based on the values of o…

…ther options git-svn-id: http://svn.foswiki.org/trunk@14005 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 16, 2012 · f560719 · f560719
1 parent deecffe
commit f560719
Show file tree

Hide file tree

Showing 8 changed files with 580 additions and 542 deletions.
diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -335,12 +335,6 @@ BEGIN {
         $Foswiki::cfg{isVALID} = 1;
     }
 
-    if ( $Foswiki::cfg{WarningsAreErrors} ) {
-
-        # Note: Warnings are always errors if ASSERTs are enabled
-        $SIG{'__WARN__'} = sub { die @_ };
-    }
-
     if ( $Foswiki::cfg{UseLocale} ) {
         require locale;
         import locale();

diff --git a/core/lib/Foswiki.spec b/core/lib/Foswiki.spec
diff --git a/core/lib/Foswiki/Configure/Load.pm b/core/lib/Foswiki/Configure/Load.pm
@@ -7,6 +7,9 @@
 Handling for loading configuration information (Foswiki.spec, Config.spec and
 LocalSite.cfg) as efficiently and flexibly as possible.
 
+This reads *values* from these files and does *not* parse the structured comments. For that,
+see FoswikiCfg.pm
+
 =cut
 
 package Foswiki::Configure::Load;

diff --git a/core/lib/Foswiki/Configure/Types/SELECT.pm b/core/lib/Foswiki/Configure/Types/SELECT.pm
@@ -12,7 +12,6 @@ sub prompt {
     my ( $this, $id, $opts, $value, $class ) = @_;
     $opts =~ s/^\s+//;
     $opts =~ s/\s+$//;
-    $opts =~ s/(\b|^)EXPERT(\b|$)//i;
     my $sopts = '';
     if ( defined($value) ) {
         $sopts .= '<option selected="selected">' . $value . '</option>';

diff --git a/core/lib/Foswiki/Configure/UIs/Value.pm b/core/lib/Foswiki/Configure/UIs/Value.pm
@@ -40,11 +40,11 @@ sub renderHtml {
 
     return '' if $value->{hidden};
 
-    my $isExpert = $value->isExpertsOnly();
-    my $info     = '';
-
-    $info .= $value->{desc};
-    my $keys = $value->getKeys();
+    my $isExpert  = $value->isExpertsOnly();
+    my $displayIf = $value->displayIf();
+    my $enableIf  = $value->enableIf();
+    my $info      = $value->{desc};
+    my $keys      = $value->getKeys();
 
     my $checker  = Foswiki::Configure::UI::loadChecker( $keys, $value );
     my $isUnused = 0;
@@ -139,12 +139,17 @@ HERE
 "<div id='info_$tip' class='configureInfoText foswikiMakeHidden'>$info</div>";
     }
 
-    my $class = join( ' ', @cssClasses );
+    my %props;
+    $props{class} = join( ' ', @cssClasses ) if ( scalar @cssClasses );
+    $props{'data-displayif'} = $displayIf if $displayIf;
+    $props{'data-enableif'} = $enableIf if $enableIf;
 
-    $output .=
-      _getRowHtml( $class, "$index$hiddenTypeOf", $helpTextLink,
-        "$control&nbsp;$resetToDefaultLinkText$check$helpText" )
-      . "\n";
+    $output .= CGI::Tr(
+	\%props,
+	CGI::th( "$index$hiddenTypeOf" )
+	. CGI::td( "$control&nbsp;$resetToDefaultLinkText$check$helpText" )
+	. CGI::td( { class => "configureHelp" }, $helpTextLink ) )
+	. "\n";
 
     return (
         $output,
@@ -158,16 +163,6 @@ HERE
     );
 }
 
-sub _getRowHtml {
-    my ( $class, $header, $info, $data ) = @_;
-
-    my $classProp = $class ? { class => $class } : undef;
-    return CGI::Tr( $classProp,
-            CGI::th( $classProp, $header )
-          . CGI::td( {}, $data )
-          . CGI::td( { class => "$class configureHelp" }, $info ) );
-}
-
 1;
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/

diff --git a/core/lib/Foswiki/Configure/Value.pm b/core/lib/Foswiki/Configure/Value.pm
@@ -69,7 +69,11 @@ sub new {
         $this->{mandatory} = ( $this->{opts} =~ /(\b|^)M(\b|$)/ );
         $this->{hidden}    = ( $this->{opts} =~ /(\b|^)H(\b|$)/ );
         $this->{expertsOnly} = 1
-          if ( $this->{opts} =~ s/\bEXPERT\b// );
+          if ( $this->{opts} =~ s/(\b|^)EXPERT(\b|$)// );
+        $this->{displayIf} = $1
+          if ( $this->{opts} =~ s/(?:\b|^)DISPLAY_IF\s+(.*?)(\/DISPLAY_IF|$)// );
+        $this->{enableIf} = $1
+          if ( $this->{opts} =~ s/(?:\b|^)ENABLE_IF\s+(.*?)(\/ENABLE_IF|$)// );
     }
 
     return $this;
@@ -81,6 +85,16 @@ sub isExpertsOnly {
     return $this->{expertsOnly};
 }
 
+sub displayIf {
+    my $this = shift;
+    return $this->{displayIf} || '';
+}
+
+sub enableIf {
+    my $this = shift;
+    return $this->{enableIf} || '';
+}
+
 # See Foswiki::Configure::Item
 sub getKeys {
     my $this = shift;