checkboxes back

[ikiwiki.git] / IkiWiki / Plugin / websetup.pm

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 47715b85918c3650bd2b7816373e2c2071c6bf97..8bef44925c13e81e0afd0083e36687b117b04e06 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -15,6 +15,10 @@ sub import { #{{{
 
 sub getsetup () { #{{{
        return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
                websetup_force_plugins => {
                        type => "string",
                        example => [],
@@ -100,10 +104,12 @@ sub showfields ($$$@) { #{{{
                        name => $name,
                        label => "",
                        type => "checkbox",
-                       options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ],
-                       value => $enabled,
                        fieldset => $section,
+                       options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ]]
                );
+               if (! $form->submitted) {
+                       $form->field(name => $name, value => $enabled);
+               }
                if ($plugin_forced) {
                        $form->field(name => $name, disabled => 1);
                }
@@ -176,10 +182,12 @@ sub showfields ($$$@) { #{{{
                                name => $name,
                                label => "",
                                type => "checkbox",
-                               value => $value,
                                options => [ [ 1 => $description ] ],
                                fieldset => $section,
                        );
+                       if (! $form->submitted) {
+                               $form->field(name => $name, value => $value);
+                       }
                }
                
                if (! $info{safe}) {
@@ -341,14 +349,12 @@ sub showform ($$) { #{{{
                                        delete $rebuild{$field};
                                }
                                else {
-                                       print STDERR ">>$key (@value) ($config{$key})\n";
                                        $config{$key}=$value[0];
                                }
                        }
                }
                
                if (%rebuild && ! $form->field("rebuild_asked")) {
-                       print STDERR ">>".(join "," , keys %rebuild)."\n";
                        my $required=0;
                        foreach my $field ($form->field) {
                                $required=1 if $rebuild{$field};