From 847144a32fdc66af2060b21aa9958887683a293b Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Fri, 25 Jul 2008 04:03:04 +0000
Subject: [PATCH] fixed: edit branch doesn't show list style metadata fields
 properly

---
 docs/changelog/7.x.x.txt  |  1 +
 lib/WebGUI/AssetBranch.pm | 35 +++++++++++++++++------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 629338f19..2d3a5f4d3 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.5.18
+ - fixed: edit branch doesn't show list style metadata fields properly
  - fixed: Product no longer shows "Continue Shopping" view when a different user adds the Product to their Cart.  The issue was the Product cached itself when an item was added to the cart.  Now it checks for if a cart asset exists for this session.
  - fixed: HTML Export now creates a new session for each asset it exports to 
    stop problems from certain flags that get set once per session.
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index 891570945..ca08fef84 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -206,24 +206,23 @@ sub www_editBranch {
         if ($self->session->setting->get("metaDataEnabled")) {
                 my $meta = $self->getMetaDataFields();
                 foreach my $field (keys %$meta) {
-                        my $fieldType = $meta->{$field}{fieldType} || "text";
-                        my $options;
-                        # Add a "Select..." option on top of a select list to prevent from
-                        # saving the value on top of the list when no choice is made.
-                        if($fieldType eq "selectList") {
-                                $options = {"", $i18n->get("Select")};
-                        }
-                        $tabform->getTab("meta")->dynamicField(
-                                 name=>"metadata_".$meta->{$field}{fieldId},
-                                 label=>$meta->{$field}{fieldName},
-                                 uiLevel=>5,
-                                 value=>$meta->{$field}{value},
-                                 extras=>qq/title="$meta->{$field}{description}"/,
-                                 possibleValues=>$meta->{$field}{possibleValues},
-                                 options=>$options,
-				 subtext=>'<br />'.$i18n->get("change").' '.WebGUI::Form::yesNo($self->session,{name=>"change_metadata_".$meta->{$field}{fieldId}}),
-				fieldType=>$fieldType
-                                );
+                    my $fieldType = $meta->{$field}{fieldType} || "text";
+                    my $options = $meta->{$field}{possibleValues};
+                    # Add a "Select..." option on top of a select list to prevent from
+                    # saving the value on top of the list when no choice is made.
+                    if("\l$fieldType" eq "selectBox") {
+                        $options = "|" . $i18n->get("Select") . "\n" . $options;
+                    }
+                    $tabform->getTab("meta")->dynamicField(
+                        name            => "metadata_".$meta->{$field}{fieldId},
+                        label           => $meta->{$field}{fieldName},
+                        uiLevel         => 5,
+                        value           => $meta->{$field}{value},
+                        extras          => qq/title="$meta->{$field}{description}"/,
+                        options         => $options,
+                        defaultValue    => $meta->{$field}{defaultValue},
+                        subtext         => '<br />'.$i18n->get("change").' '.WebGUI::Form::yesNo($self->session,{name=>"change_metadata_".$meta->{$field}{fieldId}}),
+                    );
                 }
         }	
 	return $ac->render($tabform->print, $i18n->get('edit branch','Asset'));