Author: ssenrogn
Date: 2008-04-18 21:52:34 +0200 (Fri, 18 Apr 2008)
New Revision: 6496
Modified:
branches/2.17/view-control-spi/src/main/java/no/sesat/search/view/navigation/OptionNavigationController.java
Log:
SEARCH-4505 - readded handling of tab override on option level.
Modified:
branches/2.17/view-control-spi/src/main/java/no/sesat/search/view/navigation/OptionNavigationController.java
===================================================================
---
branches/2.17/view-control-spi/src/main/java/no/sesat/search/view/navigation/OptionNavigationController.java
2008-04-18 19:50:35 UTC (rev 6495)
+++
branches/2.17/view-control-spi/src/main/java/no/sesat/search/view/navigation/OptionNavigationController.java
2008-04-18 19:52:34 UTC (rev 6496)
@@ -127,7 +127,6 @@
final NavigationItem parentResult =
dataModel.getNavigation().getNavigation(config.getParent().getId());
final StringDataObject optionSelectedValue =
dataModel.getParameters().getValue(config.getParent().getField());
-
boolean selectionDone = false;
for (final OptionsNavigationConfig.Option option : optionsToAdd) {
@@ -146,9 +145,18 @@
}
if (value != null) {
+ final Map<String,String> urlParameters;
+
+ if (option.getTab() != null) {
+ urlParameters = new HashMap<String, String>(1);
+ urlParameters.put(SearchTab.PARAMETER_KEY,
option.getTab());
+ } else {
+ urlParameters = Collections.<String, String> emptyMap();
+ }
+
final NavigationItem navigator = new BasicNavigationItem(
option.getDisplayName(),
- context.getUrlGenerator().getURL(value,
config.getParent()),
+ context.getUrlGenerator().getURL(value,
config.getParent(), urlParameters),
-1);
parentResult.addResult(navigator);
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
