This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
Added ability to specify label position as an element label option #6752
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| $this->helper->setLabelPosition('append'); | ||
| $markup = $this->helper->render($element); | ||
| $this->assertContains('<label><span>The value for foo:</span><', $markup); | ||
| $this->assertContains('</label>', $markup); |
There was a problem hiding this comment.
This test only tests if it overrides the label position, but it does not test if the default label position is respected. I encountered earlier issues where the FormRow view helper did some unwanted caching so I think it is a good thing to make sure this does not happen again.
By adding a second element you can test for that:
public function testCanOverrideLabelPosition()
{
$fooElement = new Element('foo');
$fooElement->setOptions(array(
'label' => 'The value for foo:',
'label_options' => array(
'label_position' =>'prepend'
),
));
$barElement = new Element('bar');
$barElement->setOptions(array(
'label' => 'The value for bar:',
));
$this->helper->setLabelPosition('append');
$fooMarkup = $this->helper->render($fooElement);
$this->assertContains('<label><span>The value for foo:</span><', $fooMarkup);
$this->assertContains('</label>', $fooMarkup);
$barMarkup = $this->helper->render($barElement);
$this->assertContains('<label><', $barMarkup);
$this->assertContains('<span>The value for foo:</span></label>', $barMarkup);
}
weierophinney
added a commit
that referenced
this pull request
Feb 23, 2015
Added ability to specify label position as an element label option Merge fixes test errors introduced in the original patch. Conflicts: library/Zend/Form/View/Helper/FormRow.php
weierophinney
added a commit
that referenced
this pull request
Feb 23, 2015
| @@ -213,7 +213,13 @@ public function render(ElementInterface $element) | |||
| $labelOpen = $labelClose = $label = ''; | |||
| } | |||
|
|
|||
| switch ($this->labelPosition) { | |||
| $labelPosition = $this->labelPosition; | |||
There was a problem hiding this comment.
This line caused two test failures. Essentially, it was overriding lines 128-130, which were setting the value of $labelPosition to the instance property if it had not been passed. As such, I removed it, as the value will be properly initialized by this point already.
|
Merged to develop for release in 2.4. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Does exactly what it says on the tin