Merge to trunk. Fixing tab flag 1 filtering when there is only one portal. NIHVIVO-987
This commit is contained in:
parent
ef3222d0d1
commit
5671656d5d
6 changed files with 24 additions and 14 deletions
|
@ -59,7 +59,7 @@ public class FiltersForTabsTest {
|
|||
tab.setPortalId(7);
|
||||
|
||||
UnaryFunctor<Individual,Boolean> testFn =
|
||||
FiltersForTabs.getFilterForTab(tab, new Portal());
|
||||
FiltersForTabs.getFilterForTab(tab, new Portal(), false);
|
||||
Assert.assertTrue ( testFn!=null);
|
||||
|
||||
|
||||
|
@ -75,7 +75,7 @@ public class FiltersForTabsTest {
|
|||
Assert.assertTrue( testFn.fn( ind));
|
||||
|
||||
tab.setFlag2Mode("OMIT");
|
||||
testFn = FiltersForTabs.getFilterForTab(tab, new Portal());
|
||||
testFn = FiltersForTabs.getFilterForTab(tab, new Portal(), false);
|
||||
|
||||
Assert.assertFalse( testFn.fn(ind));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue