fixed label association when input has a user-defined id attribute (f…

…ixes #72)
bramp · Apr 27, 2012 · f61ba42 · f61ba42
1 parent 4955070
commit f61ba42
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/widgets/input/BootInput.php b/widgets/input/BootInput.php
@@ -202,6 +202,17 @@ protected function getAppend($htmlOptions = array())
 		else
 			return '';
 	}
+
+	/**
+	 * Returns the id that should be used for the specified attribute
+	 * @param string $attribute the attribute
+	 * @return string the id 
+	 */
+	protected function getAttributeId($attribute) 
+	{
+		return isset($this->htmlOptions['id']) ? $this->htmlOptions['id'] : 
+			CHtml::getIdByName(CHtml::resolveName($this->model, $attribute));
+	}
 
 	/**
 	 * Returns the input container CSS classes.

diff --git a/widgets/input/BootInputHorizontal.php b/widgets/input/BootInputHorizontal.php
@@ -37,6 +37,9 @@ protected function getLabel($htmlOptions = array())
 			$htmlOptions['class'] .= ' '.$classes;
 		else
 			$htmlOptions['class'] = $classes;
+
+		if(isset($this->htmlOptions['id']))
+			$htmlOptions['for'] = $this->htmlOptions['id'];
 
 		return parent::getLabel($htmlOptions);
 	}
@@ -49,7 +52,7 @@ protected function checkBox()
 	{
 		$attribute = $this->attribute;
 		echo '<div class="controls">';
-		echo '<label class="checkbox" for="'.CHtml::getIdByName(CHtml::resolveName($this->model, $attribute)).'">';
+		echo '<label class="checkbox" for="'.$this->getAttributeId($attribute).'">';
 		echo $this->form->checkBox($this->model, $attribute, $this->htmlOptions).PHP_EOL;
 		echo $this->model->getAttributeLabel($attribute);
 		echo $this->getError().$this->getHint();

diff --git a/widgets/input/BootInputVertical.php b/widgets/input/BootInputVertical.php
@@ -35,7 +35,7 @@ protected function captcha()
 	protected function checkBox()
 	{
 		$attribute = $this->attribute;
-		echo '<label class="checkbox" for="'.CHtml::getIdByName(CHtml::resolveName($this->model, $attribute)).'">';
+		echo '<label class="checkbox" for="'.$this->getAttributeId($attribute).'">';
 		echo $this->form->checkBox($this->model, $this->attribute, $this->htmlOptions).PHP_EOL;
 		echo $this->model->getAttributeLabel($attribute);
 		echo $this->getError().$this->getHint();