Author: ssthkjer Date: 2007-06-05 11:56:38 +0200 (Tue, 05 Jun 2007) New Revision: 5270
Modified: branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTab.java branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTabFactory.java Log: https://jira.sesam.no/jira/browse/SEARCH-2412 - Default-template.css har feil URL i Persons?\195?\184ket Modified: branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTab.java =================================================================== --- branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTab.java 2007-06-05 08:27:58 UTC (rev 5269) +++ branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTab.java 2007-06-05 09:56:38 UTC (rev 5270) @@ -108,6 +108,11 @@ * Holds the value of property absoluteOrdering. */ private final boolean absoluteOrdering; + + /** + * Holds the value of property displayCss. + */ + private final boolean displayCss; /** * Holds the value of property executeOnBlank. @@ -174,6 +179,7 @@ final List<String> css, final List<String> javascript, final boolean absoluteOrdering, + final boolean displayCss, final boolean executeOnBlank, final Layout layout){ @@ -199,11 +205,12 @@ : inherit != null ? inherit.adCommand : null; this.adLimit = adLimit >=0 || inherit == null ? adLimit : inherit.adLimit; this.adOnTop = adOnTop >=0 || inherit == null ? adOnTop : inherit.adOnTop; + this.displayCss = displayCss; if(inherit != null){ // we cannot inherit navigators because there require a live reference to the applicable SearchTabFactory // but we do inherit enrichments and css this.enrichments.addAll(inherit.enrichments); - this.css.addAll(inherit.css); + this.css.addAll(inherit.css); } this.rssResultName = rssResultName; this.css.addAll(css); @@ -381,6 +388,14 @@ } /** + * Getter for property displayCss + * @return + */ + public boolean isDisplayCss() { + return displayCss; + } + + /** * Getter for property enrichments. * @return Value of property enrichments. */ @@ -467,7 +482,9 @@ // XXX cache result final List<SearchTab> ancestry = new ArrayList<SearchTab>(); for(SearchTab t = this; t != null; t = t.getInherit()){ - ancestry.add(t); + if (t.displayCss) { + ancestry.add(t); + } } Collections.reverse(ancestry); return Collections.unmodifiableList(ancestry); Modified: branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTabFactory.java =================================================================== --- branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTabFactory.java 2007-06-05 08:27:58 UTC (rev 5269) +++ branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTabFactory.java 2007-06-05 09:56:38 UTC (rev 5270) @@ -243,6 +243,8 @@ final String[] css = allCss != null ? allCss.split(",") : new String[]{}; final String allJavascript = parseString(tabE.getAttribute("javascript"), null); final String[] javascript = allJavascript != null ? allJavascript.split(",") : new String[]{}; + final boolean displayCss = parseBoolean(tabE.getAttribute("display-css"), true); + // enrichment hints final NodeList enrichmentNodeList = tabE.getElementsByTagName("enrichment"); final Collection<SearchTab.EnrichmentHint> enrichments = new ArrayList<SearchTab.EnrichmentHint>(); @@ -333,9 +335,10 @@ parseBoolean(tabE.getAttribute("absolute-ordering"), inherit != null ? inherit.isAbsoluteOrdering() : false), + parseBoolean(tabE.getAttribute("display-css"), true), parseBoolean(tabE.getAttribute("execute-on-blank"), inherit != null - ? inherit.isExecuteOnBlank() - : true), + ? inherit.isExecuteOnBlank() + : true), layout); try{ _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
