Author: vbriand Date: 2011-01-13 10:19:30 +0100 (Thu, 13 Jan 2011) New Revision: 168 Url: http://chorem.org/repositories/revision/bow/168 Log: The results of a research can be removed again Modified: trunk/src/main/webapp/jsp/search.jsp Modified: trunk/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/src/main/webapp/jsp/search.jsp 2011-01-07 19:02:06 UTC (rev 167) +++ trunk/src/main/webapp/jsp/search.jsp 2011-01-13 09:19:30 UTC (rev 168) @@ -53,7 +53,7 @@ <div id="content"> <div class="menu clearfix"> <h2><s:text name="bow.search.title" /></h2> - <s:url id="order" action="order"> + <s:url id="order" action="order" escapeAmp="false"> <s:param name="searchLine"><%=searchLine%></s:param> <s:param name="fullTextLine"><%=fullText%></s:param> </s:url> @@ -69,18 +69,13 @@ <option value="descDate">Desc Date</option> </select> <s:submit key="bow.search.submit" /> - <% - List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); - int bookmarksNb = bookmarkList.size(); - - if (bookmarksNb > 0) { - %> - <s:url id="deleteSearchResult" action="deleteSearchResult"> + <s:if test="%{#request.bookmarkActions.getBookmarks().size() > 0}"> + <s:url id="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> <s:param name="searchLine"><%=searchLine%></s:param> <s:param name="fullTextLine"><%=fullText%></s:param> </s:url> - <s:a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation(%{deleteSearchResult}, <%=bookmarksNb%>); return(false);"></s:a> - <% } %> + <s:a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#request.bookmarkActions.getBookmarks().size()}); return(false);"></s:a> + </s:if> </p> </s:form> </div>