Changeset 5221

Timestamp:

01/27/10 03:16:14 (7 weeks ago)

Author:

auno

Message:

Added param for no db selected. BugzID#103387

Location:

trunk

Files:

• lib/MT/App/Wizard.pm (modified) (3 diffs)
• tmpl/wizard/configure.tmpl (modified) (1 diff)

trunk/lib/MT/App/Wizard.pm

@@ -747 +747 @@
             else {
                 if (@dbs) {
-                    $param{database_list} = \@dbs;
-                    $param{one_database}  = @dbs == 0;
+                    my @f;
+                    foreach my $field ( @{ $param{field_loop} } ) {
+                        if ( $field->{id} eq 'dbname' ) {
+                            $field->{element} = 'select';
+                            my @options;
+                            foreach my $db (@dbs) {
+                                my $select = {};
+                                $select->{value} = $db->{name};
+                                $select->{label} = $db->{name};
+                                push @options, $select;
+                            }
+                            $field->{option_loop} = \@options;
+                        }
+                        push @f, $field;
+                    }
+                    $param{field_loop}   = \@f;
+                    $param{one_database} = @dbs == 0;
                     $err_msg
                         = $app->translate(
@@ -1232 +1247 @@
         $field->{label_class}   = $data->{label_class};
         $field->{content_class} = $data->{content_class};
-        my @options;
 
         if ( $data->{element} eq 'select' ) {
+            my @options;
             my $option = $data->{option};
             foreach my $key ( keys %$option ) {
@@ -1242 +1257 @@
                 push @options, $select;
             }
+            $field->{option_loop} = \@options;
         }
         else {
             $field->{type} = $data->{type};
         }
-        $field->{option_loop} = \@options;
         if ( $data->{advanced} ) {
             push @$advanced, $field;

trunk/tmpl/wizard/configure.tmpl

@@ -86 +86 @@
                 hint="<mt:var name="hint">"
                 show_hint="<mt:var name="show_hint" default="0">">
+            <mt:if name="element" eq="select">
+                <select id="<mt:var name="id">" name="<mt:var name="id">">
+                <mt:loop name="option_loop">
+                    <option value="<mt:var name="value">" <mt:if name="selected">selected="selected"</mt:if>><mt:var name="label"></option>
+                </mt:loop>
+                </select>
+            <mt:else>
                 <input type="<mt:var name="type">" name="<mt:var name="id">" value="<mt:if name="$id"><mt:var name="$id"><mt:else><mt:var name="default" escape="html"></mt:if>" />
+            </mt:if>
             </mtapp:setting>
         </mt:loop>