Author: ssmaeklu
Date: 2007-08-17 14:55:31 +0200 (Fri, 17 Aug 2007)
New Revision: 5628
Modified:
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/SearchTabFactory.java
trunk/view-control-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/ResultPagingNavigationController.java
Log:
Navigation <reset> unbroken
Modified:
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/SearchTabFactory.java
===================================================================
---
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/SearchTabFactory.java
2007-08-17 10:25:17 UTC (rev 5627)
+++
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/SearchTabFactory.java
2007-08-17 12:55:31 UTC (rev 5628)
@@ -447,13 +447,13 @@
final Node navElement = navs.item(j);
if (RESET_NAV_ELEMENT.equals(navElement.getNodeName())) {
- final String resetNavId =
((Element)navElement).getAttribute("modeId");
- if (modeId != null) {
- final NavigationConfig.Nav nav =
navigation.getNavMap().get(resetNavId);
+ final String resetNavId =
((Element)navElement).getAttribute("id");
+ if (resetNavId != null) {
+ final NavigationConfig.Nav nav =
cfg.getNavMap().get(resetNavId);
if (nav != null) {
navigation.addReset(nav);
} else {
- LOG.error("Error in config, <reset modeId=\""
+ modeId + "\" />, in mode " + modeId + " not found");
+ LOG.error("Error in config, <reset id=\"" +
resetNavId + "\" />, in mode " + modeId + " not found");
}
}
}
Modified:
trunk/view-control-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/ResultPagingNavigationController.java
===================================================================
---
trunk/view-control-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/ResultPagingNavigationController.java
2007-08-17 10:25:17 UTC (rev 5627)
+++
trunk/view-control-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/ResultPagingNavigationController.java
2007-08-17 12:55:31 UTC (rev 5628)
@@ -63,7 +63,7 @@
final String pageOffset =
Integer.toString(pager.getOffsetOfPage(pager.getCurrentPage() + 1));
final String url =
NavigationHelper.getUrlFragment(context.getDataModel(), config, pageOffset,
null);
item.addResult(new
BasicNavigationItem(messages.getMessage("next"), url, config.getPageSize()));
- }
+ }
return item;
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
