From d36bc64f3111f96fbc51c7e28253717558e06c4e Mon Sep 17 00:00:00 2001
From: Luke Hudson <lukeletters@gmail.com>
Date: Mon, 26 Apr 2010 23:27:42 +0000
Subject: [PATCH] BUGFIX: Prevent duplicate HTML IDs in ModelAdmin

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103519 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 839a01ba..efd9bccd 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -423,17 +423,17 @@ class ModelAdmin_CollectionController extends Controller {
 		}
 		
 		$buttonLabel = sprintf(_t('ModelAdmin.CREATEBUTTON', "Create '%s'", PR_MEDIUM, "Create a new instance from a model class"), singleton($modelName)->i18n_singular_name());
-		
-		$actions = new FieldSet(
-			$createButton = new FormAction('add', $buttonLabel)
-		);
-		
+
+		$form = new Form($this, "CreateForm",
+						new FieldSet(),
+						$createButton = new FormAction('add', $buttonLabel),
+						$validator = new RequiredFields()
+				);
+	
 		$createButton->dontEscape = true;
-		
-		$validator = new RequiredFields();
 		$validator->setJavascriptValidationHandler('none');
-		
-		return new Form($this, "CreateForm", new FieldSet(), $actions, $validator);	
+		$form->setHTMLID("Form_CreateForm_" . $this->modelClass);
+		return $form;
 	}
 	
 	/**
@@ -488,6 +488,7 @@ class ModelAdmin_CollectionController extends Controller {
 			$actions,
 			$validator
 		);
+		$form->setHTMLID("Form_ImportForm_" . $this->modelClass);
 		return $form;
 	}