[Jifty-commit] r7182 - jifty/trunk/lib/Jifty/Plugin/SetupWizard

[Jifty commits]

Author: sartak
Date: Thu Jun  4 18:58:28 2009
New Revision: 7182

Modified:
   jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm

Log:
Reorganization so all the setup comes first

Modified: jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm	Thu Jun  4 18:58:28 2009
@@ -119,8 +119,6 @@
 };
 
 template '/__jifty/admin/setupwizard/database' => sub {
-    p { _("You may choose a database engine.") };
-
     # XXX: We've got to add a sane way to unquote stuff in onfoo handlers...
     my $onchange = 'Jifty.update('
                  . Jifty::JSON::objToJson({
@@ -141,12 +139,15 @@
     $onchange =~ s/PLACEHOLDER/'+this.value+'/;
 
     # Only show them drivers they have available
-    my @available_values =
+    my @available_drivers =
         grep { Jifty->handle->is_available_driver($_->{value}) } (
             { display => 'SQLite',     value => 'SQLite' },
             { display => 'MySQL',      value => 'mysql' },
             { display => 'PostgreSQL', value => 'Pg' },
         );
+    my $current_driver = Jifty->config->framework('Database')->{Driver};
+
+    p { _("You may choose a database engine.") };
 
     config_field(
         field      => 'Driver',
@@ -154,7 +155,7 @@
         value_args => {
             label            => 'Database Engine',
             render_as        => 'select',
-            available_values => \@available_values,
+            available_values => \@available_drivers,
             onchange         => [$onchange],
         },
     );
@@ -167,10 +168,9 @@
         },
     );
 
-    my $driver = Jifty->config->framework('Database')->{Driver};
     render_region(
         name => 'database_details',
-        path => "/__jifty/admin/setupwizard/database/$driver",
+        path => "/__jifty/admin/setupwizard/database/$current_driver",
     );
 };