[Jifty-commit] r7262 - jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action

[Jifty commits]

Author: sartak
Date: Mon Jun 15 23:49:11 2009
New Revision: 7262

Modified:
   jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action/FinalizeSetup.pm

Log:
Use a SetupMode config variable instead

    Unfortunately we can't overwrite the "activated" variable from
    config.yml with a second copy of SetupWizard. The first copy of
    SetupWizard will still be activated. I kind of like SetupMode, we
    should be able to make SetupMode automatically turn on AdminMode as
    well.

Modified: jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action/FinalizeSetup.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action/FinalizeSetup.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action/FinalizeSetup.pm	Mon Jun 15 23:49:11 2009
@@ -7,27 +7,8 @@
     my $self   = shift;
     my $config = shift;
 
-    # Disable admin mode (a requirement for SetupWizard)
     $config->{framework}{AdminMode} = 0;
-
-    # Deactivate SetupWizard
-    my @plugins = @{ $config->{framework}{Plugins} || [] };
-    my $deactivated = 0;
-
-    for my $plugin (@plugins) {
-        my ($name) = keys %$plugin;
-        if ($name =~ /SetupWizard/) {
-            $plugin->{activated} = 0;
-            $deactivated = 1;
-
-            # There may be multiple instances of SetupWizard (!) in the list,
-            # so we don't "last" out here
-        }
-    }
-
-    if (!$deactivated) {
-        warn "Unable to find SetupWizard in the plugin list, so I cannot deactivate it!";
-    }
+    $config->{framework}{SetupMode} = 0;
 
     return $config;
 }
@@ -60,8 +41,7 @@
 
 Writes the config settings for finalizing and deactivating the setup wizard.
 
-It turns off admin mode, and sets the "activated" option of SetupWizard to
-false.
+It turns off admin mode and setup mode.
 
 =cut