Merge branch 'master' into 8-merge

Conflicts:
	docs/gotcha.txt
	docs/upgrades/upgrade_7.9.8-7.9.9.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	t/Asset/Asset.t
	t/Mail/Send.t
	t/Session/Url.t
	t/lib/WebGUI/Test.pm
This commit is contained in:
Doug Bell 2010-07-14 17:06:19 -05:00
commit cd1e450c32
1229 changed files with 499 additions and 313891 deletions

View file

@ -138,14 +138,17 @@ $board->view;
cmp_bag(
$templateVars->{rows_loop},
[
{
superhashof({
deptHasChanged => ignore(),
status => 'In',
dateStamp => ignore(),
message => 'work time',
username => 'red',
},
ignore(), ignore(), ignore(), ignore(),
}),
superhashof({ username => 'Admin' }),
superhashof({ username => 'boggs' }),
superhashof({ username => 'andy' }),
superhashof({ username => 'hadley' }),
],
'view: returns one entry for each user, entry is correct for user with status'
) or diag(Dumper $templateVars->{rows_loop});