CheckboxList, RadioList: fixed rendering of <label n:name>

Conflicts: tests/Forms.Latte/FormMacros.forms.phpt
nette · Jun 17, 2015 · ea7b7b8 · ea7b7b8
1 parent a1e3965
commit ea7b7b8
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 5 deletions.
diff --git a/src/Forms/Controls/CheckboxList.php b/src/Forms/Controls/CheckboxList.php
@@ -96,9 +96,11 @@ public function getControlPart($key)
 	/**
 	 * @return Html
 	 */
-	public function getLabelPart($key)
+	public function getLabelPart($key = NULL)
 	{
-		return parent::getLabel($this->items[$key])->for($this->getHtmlId() . '-' . $key);
+		return func_num_args()
+			? parent::getLabel($this->items[$key])->for($this->getHtmlId() . '-' . $key)
+			: $this->getLabel();
 	}
 
 }
diff --git a/src/Forms/Controls/RadioList.php b/src/Forms/Controls/RadioList.php
@@ -149,9 +149,11 @@ public function getControlPart($key)
 	/**
 	 * @return Html
 	 */
-	public function getLabelPart($key)
+	public function getLabelPart($key = NULL)
 	{
-		return parent::getLabel($this->items[$key])->for($this->getHtmlId() . '-' . $key);
+		return func_num_args()
+			? parent::getLabel($this->items[$key])->for($this->getHtmlId() . '-' . $key)
+			: $this->getLabel();
 	}
 
 }
diff --git a/tests/Forms.Latte/FormMacros.forms.phpt b/tests/Forms.Latte/FormMacros.forms.phpt
@@ -33,7 +33,7 @@ $form->addRadioList('sex', 'Sex:', array('m' => 'male', 'f' => 'female'));
 $form->addSelect('select', NULL, array('m' => 'male', 'f' => 'female'));
 $form->addTextArea('area', NULL)->setValue('one<two');
 $form->addCheckbox('checkbox', NULL);
-$form->addCheckboxList('checklist', NULL, array('m' => 'male', 'f' => 'female'));
+$form->addCheckboxList('checklist', 'CheckboxList:', array('m' => 'male', 'f' => 'female'));
 $form->addSubmit('send', 'Sign in');
 $form['my'] = new MyControl;
 

diff --git a/tests/Forms.Latte/expected/FormMacros.forms.html b/tests/Forms.Latte/expected/FormMacros.forms.html
@@ -69,6 +69,9 @@
 	<label title=hello for="frm-sex-m"> <input type="radio" name="sex" id="frm-sex-m" value="m"> </label>
 	<label for="frm-sex-f"> <input type="radio" name="sex" id="frm-sex-f" value="f"> female</label>
 	<label title=hello for="frm-sex-f"> <input type="radio" name="sex" id="frm-sex-f" value="f"> </label>
+<label></label>
+<label>Sex:</label>
+<label title="hello">Sex:</label>
 
 
 <label for="frm-checkbox"> <input type="checkbox" name="checkbox" id="frm-checkbox"> Label</label>
@@ -80,6 +83,9 @@
 	<label for="frm-checklist-m"> <input title=hello type="checkbox" name="checklist[]" id="frm-checklist-m" value="m"> </label>
 	<label for="frm-checklist-f"> <input type="checkbox" name="checklist[]" id="frm-checklist-f" value="f"> female</label>
 	<label for="frm-checklist-f"> <input title=hello type="checkbox" name="checklist[]" id="frm-checklist-f" value="f"> </label>
+<label></label>
+<label>CheckboxList:</label>
+<label title="hello">CheckboxList:</label>
 
 
 <form id="myForm" class="ajax" action="" method="post">

diff --git a/tests/Forms.Latte/expected/FormMacros.forms.phtml b/tests/Forms.Latte/expected/FormMacros.forms.phtml
@@ -57,6 +57,12 @@ echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $_contro
   'title' => NULL,
 ))->attributes() ?>> <input<?php $_input = $_form["sex"]; echo $_input->getControlPart($key)->attributes() ?>> </label>
 <?php $iterations++; } ?>
+<label<?php $_input = $_form["sex"]; echo $_input->{method_exists($_input, 'getLabelPart')?'getLabelPart':'getLabel'}()->attributes() ?>></label>
+<label<?php $_input = $_form["sex"]; echo $_input->{method_exists($_input, 'getLabelPart')?'getLabelPart':'getLabel'}()->attributes() ?>
+><?php echo $_input->getLabel()->getHtml() ?></label>
+<label title="hello"<?php $_input = $_form["sex"]; echo $_input->{method_exists($_input, 'getLabelPart')?'getLabelPart':'getLabel'}()->addAttributes(array (
+  'title' => NULL,
+))->attributes() ?>><?php echo $_input->getLabel()->getHtml() ?></label>
 
 
 <?php if ($_label = $_form["checkbox"]->getLabelPart("")) echo $_label->startTag() ?>
@@ -79,6 +85,12 @@ echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $_contro
   'title' => NULL,
 ))->attributes() ?>> </label>
 <?php $iterations++; } ?>
+<label<?php $_input = $_form["checklist"]; echo $_input->{method_exists($_input, 'getLabelPart')?'getLabelPart':'getLabel'}()->attributes() ?>></label>
+<label<?php $_input = $_form["checklist"]; echo $_input->{method_exists($_input, 'getLabelPart')?'getLabelPart':'getLabel'}()->attributes() ?>
+><?php echo $_input->getLabel()->getHtml() ?></label>
+<label title="hello"<?php $_input = $_form["checklist"]; echo $_input->{method_exists($_input, 'getLabelPart')?'getLabelPart':'getLabel'}()->addAttributes(array (
+  'title' => NULL,
+))->attributes() ?>><?php echo $_input->getLabel()->getHtml() ?></label>
 
 
 <?php if (1) { ?><form id="myForm" class="ajax"<?php echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $_control["myForm"], array (

diff --git a/tests/Forms.Latte/templates/forms.latte b/tests/Forms.Latte/templates/forms.latte
@@ -32,6 +32,9 @@
 	{label sex:$key} {input sex:$key} {$label}{/label}
 	<label n:name="sex:$key" title=hello> <input n:name="sex:$key"> </label>
 {/foreach}
+<label n:name="sex"></label>
+<label n:name="sex" />
+<label n:name="sex" title="hello" />
 
 
 {* partial rendering of Checkbox *}
@@ -45,6 +48,9 @@
 	{label checklist:$key} {input checklist:$key} {$label}{/label}
 	<label n:name="checklist:$key"> <input n:name="checklist:$key" title=hello> </label>
 {/foreach}
+<label n:name="checklist"></label>
+<label n:name="checklist" />
+<label n:name="checklist" title="hello" />
 
 
 <form n:name="myForm" id="myForm" class="ajax" n:if=1>