Fix#4103 #4133

Closed
wants to merge 4 commits into
from

Projects

None yet

3 participants

@ghost
ghost commented Mar 27, 2013

Fix for issue #4103

The minutes delimiter should not been shown when seconds are not shown.

@ThomasCantonnet ThomasCantonnet commented on an outdated diff Mar 28, 2013
library/Zend/Form/View/Helper/FormDateTimeSelect.php
$selectHelper = $this->getSelectElementHelper();
- $pattern = $this->parsePattern($element->shouldRenderDelimiters());
+ $pattern = $this->parsePattern(shouldRenderDelimiters);
ThomasCantonnet
ThomasCantonnet Mar 28, 2013 Contributor

You're missing a $ here :)

Owner

Please add a unit test for this behavior.

mpalourdio added some commits Mar 28, 2013
@mpalourdio mpalourdio unit test for fix#4103
Test if the last char of the markup is '>' of '</select'>', and not the delimiter ':' that has to be removed if seconds are not shown.
635c1d5
@mpalourdio mpalourdio fixed substr 41597f4
@weierophinney weierophinney was assigned Apr 3, 2013
@weierophinney weierophinney added a commit that referenced this pull request Apr 3, 2013
@weierophinney weierophinney [#4133] fix test failure
- Default locale included ante/post meridiem marker, which select
  element was not taking into account, nor were tests, which left a
  dangling " a" following the markup, and hence a failing test. Updated
  code to strip such a format marker as well as trim the final markup.
1e27d59
@weierophinney weierophinney added a commit that referenced this pull request Apr 3, 2013
@weierophinney weierophinney [#4133] CS fixes 1c527fb
@weierophinney weierophinney added a commit that referenced this pull request Apr 3, 2013
@weierophinney weierophinney Merge branch 'hotfix/4133' into develop
Forward port #4133
3b73bbc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment