From 39d409f3548958acdaa112596e9ebbfbd92ba1b2 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 22 Jun 2009 03:23:25 +0000
Subject: [PATCH] Fix two bugs with edit branch.  One for creating the metadata
 field forms, and another in processing them.

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f27c3afce..85d1eb8b9 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.7.12
  - Updated auth to allow sending back of non-text/html mime types.
+ - fixed #10564: edit branch progress bar goes kablooey
 
 7.7.11
  - Fixed a bug where empty version tags were not deleted. (Martin Kamerbeek / Oqapi)
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index 8465fcbcd..f79a5ff96 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -223,6 +223,7 @@ sub www_editBranch {
                         $options = "|" . $i18n->get("Select") . "\n" . $options;
                     }
                     $tabform->getTab("meta")->dynamicField(
+                        fieldType       => $fieldType,
                         name            => "metadata_".$meta->{$field}{fieldId},
                         label           => $meta->{$field}{fieldName},
                         uiLevel         => 5,
@@ -316,8 +317,8 @@ sub www_editBranchSave {
         else {
             $revision = $descendant;
         }
-        foreach my $form ($form->param) {
-            if ($form =~ /^metadata_(.*)$/) {
+        foreach my $param ($form->param) {
+            if ($param =~ /^metadata_(.*)$/) {
                 my $fieldName = $1;
                 if ($form->yesNo("change_metadata_".$fieldName)) {
                     $revision->updateMetaData($fieldName,$form->process($form));