tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #302 from robert-h-curry/7113-nested-controls-breaking-last

Browse Source 
BUGFIX: Issue #7113: Recalculate itemIteratorCount when popping viewer state.
This commit is contained in:
Sam Minnée 2012-04-11 17:19:46 -07:00
commit 1189322b41
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/view/SSViewerTest.php
View File

@ -786,6 +786,48 @@ after')
) )
); );
} }
/**
* Test that nested loops restore the loop variables correctly when pushing and popping states
*/
function testNestedLoops(){
// Data to run the loop tests on - one sequence of three items, one with child elements
// (of a different size to the main sequence)
$data = new ArrayData(array(
'Foo' => new ArrayList(array(
new ArrayData(array(
'Name' => '1',
'Children' => new ArrayList(array(
new ArrayData(array(
'Name' => 'a'
)),
new ArrayData(array(
'Name' => 'b'
)),
)),
)),
new ArrayData(array(
'Name' => '2',
'Children' => new ArrayList(),
)),
new ArrayData(array(
'Name' => '3',
'Children' => new ArrayList(),
)),
)),
));
// Make sure that including a loop inside a loop will not destroy the internal count of
// items, checked by using "Last"
$this->assertEqualIgnoringWhitespace(
'1ab23last',
$this->render(
'<% loop $Foo %>$Name<% loop Children %>$Name<% end_loop %><% if Last %>last<% end_if %><% end_loop %>',
$data
)
);
}
/** /**
* @covers SSViewer::get_themes() * @covers SSViewer::get_themes()

1
view/SSViewer.php
View File

@ -50,6 +50,7 @@ class SSViewer_Scope {
function resetLocalScope(){ function resetLocalScope(){
list($this->item, $this->itemIterator, $this->popIndex, $this->upIndex, $this->currentIndex) = $this->itemStack[$this->localIndex]; list($this->item, $this->itemIterator, $this->popIndex, $this->upIndex, $this->currentIndex) = $this->itemStack[$this->localIndex];
array_splice($this->itemStack, $this->localIndex+1); array_splice($this->itemStack, $this->localIndex+1);
$this->itemIteratorTotal = $this->itemIterator ? $this->itemIterator->count() : 0;
} }
function obj($name){ function obj($name){