[Rt-commit] r19977 - in rt/3.999/trunk: lib/RT

[sartak at bestpractical.com]

Author: sartak
Date: Mon Jun 15 22:52:30 2009
New Revision: 19977

Modified:
   rt/3.999/trunk/etc/config.yml
   rt/3.999/trunk/lib/RT/Dispatcher.pm

Log:
Only show the setup wizard if it's activated

Modified: rt/3.999/trunk/etc/config.yml
==============================================================================
--- rt/3.999/trunk/etc/config.yml	(original)
+++ rt/3.999/trunk/etc/config.yml	Mon Jun 15 22:52:30 2009
@@ -46,7 +46,8 @@
         restart_url: '/Admin/Global/Jifty/restart.html'
         after_restart_url: '/Admin/Global/System.html'
         wait_seconds: 10
-    - SetupWizard: {}
+    - SetupWizard:
+        activated: 1
   PubSub: 
     Backend: Memcached
     Enable: ~

Modified: rt/3.999/trunk/lib/RT/Dispatcher.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Dispatcher.pm	(original)
+++ rt/3.999/trunk/lib/RT/Dispatcher.pm	Mon Jun 15 22:52:30 2009
@@ -155,11 +155,12 @@
 };
 
 on qr{^/$} => run {
-    return unless Jifty->config->framework('AdminMode');
     my $wizard_plugin = Jifty->find_plugin('Jifty::Plugin::SetupWizard')
         or return;
 
-    show '/__jifty/admin/setupwizard';
+    if ($wizard->plugin->{activated}) {
+        show '/__jifty/admin/setupwizard';
+    }
 };
 
 on qr{^/Dashboards/(\d+)} => run {