[Jifty-commit] jifty branch, setupwizard-refactor, updated. ff6a192925d4703c3c5b1c440d2ea3aa59d5f9e7

Jifty commits jifty-commit at lists.jifty.org
Tue Jun 22 11:39:33 EDT 2010


The branch, setupwizard-refactor has been updated
       via  ff6a192925d4703c3c5b1c440d2ea3aa59d5f9e7 (commit)
      from  37efb99a2827e81c5f883e528bd390be2c84ecb3 (commit)

Summary of changes:
 lib/Jifty/Plugin/SetupWizard/View/Helpers.pm |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit ff6a192925d4703c3c5b1c440d2ea3aa59d5f9e7
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Jun 22 11:39:51 2010 -0400

    Make the test db button work and use current values

diff --git a/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm b/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm
index 3851e29..922af76 100644
--- a/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm
+++ b/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm
@@ -169,13 +169,6 @@ template 'database_widget/Pg' => sub {
 
 template 'database_widget/test_connectivity' => sub {
     my $self = shift;
-    use Data::Dumper;
-    warn Dumper([ keys %{ Jifty->web->form->actions } ]);
-
-    my @monikers = grep { /^addconfig-framework-Database-/i } 
-                   keys %{ Jifty->web->form->actions || {} };
-
-    Jifty->log->debug("Submitting actions: " . join ", ", @monikers );
 
     my $action = new_action(
         class   => 'Jifty::Plugin::SetupWizard::Action::TestDatabaseConnectivity',
@@ -194,14 +187,16 @@ template 'database_widget/test_connectivity' => sub {
         };
     }
 
-    hyperlink(
+    $action->button(
         label     => _("Test connectivity"),
-        as_button => 1,
         onclick   => {
-            # Submit the database config actions and then the connectivity test
-            submit => [ @monikers, $action ],
+            # Submit all actions, which will be the database config actions and
+            # then the connectivity test.
+            submit => undef,
             refresh_self => 1,
         },
+        # We need to register the action since we're not providing any arguments
+        register  => 1,
     );
 
 };
@@ -248,6 +243,7 @@ sub config_field {
     my $action = new_action(
         class   => 'AddConfig',
         moniker => $moniker,
+        order   => 50,
         %{ $args{action_args} || {} }
     );
 

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list