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

[Jifty commits]

Author: sartak
Date: Tue Jun  2 18:11:52 2009
New Revision: 7172

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

Log:
Default the value's label to the field name

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	Tue Jun  2 18:11:52 2009
@@ -97,7 +97,12 @@
 
     # Grab a sensible default, the current value of config
     if (!exists($value_args{default_value})) {
-        $value_args{default_value} ||= Jifty->config->contextual_get($args{context}, $args{field});
+        $value_args{default_value} = Jifty->config->contextual_get($args{context}, $args{field});
+    }
+
+    # Grab sensible label, the value of field
+    if (!exists($value_args{label})) {
+        $value_args{label} = $args{field};
     }
 
     outs_raw($action->form_field('value' => %value_args));
@@ -183,19 +188,13 @@
     p { _("You may change web server settings.") };
 
     config_field(
-        field      => 'BaseURL',
-        context    => '/framework/Web',
-        value_args => {
-            label => 'BaseURL',
-        },
+        field   => 'BaseURL',
+        context => '/framework/Web',
     );
 
     config_field(
-        field      => 'Port',
-        context    => '/framework/Web',
-        value_args => {
-            label => 'Port',
-        },
+        field   => 'Port',
+        context => '/framework/Web',
     );
 };