Author: sletellier Date: 2011-06-24 11:54:38 +0200 (Fri, 24 Jun 2011) New Revision: 91 Url: http://chorem.org/repositories/revision/vradi/91 Log: - Activate and desactivate button is refreshed Removed: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/activeQuery.jsp Modified: trunk/vradi-web/src/main/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-06-22 09:37:50 UTC (rev 90) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-06-24 09:54:38 UTC (rev 91) @@ -217,36 +217,24 @@ | Search +--> <action name="saveQuery" method="saveQuery" class="org.chorem.vradi.actions.SearchAction"> - <!--<param name="query"/>--> - <!--<param name="queryName"/>--> <result>/WEB-INF/jsp/empty.jsp</result> </action> + <!-- - | genere la grille des resultats + | Switch query activation +--> + <action name="switchQueryActivation" method="switchQueryActivation" class="org.chorem.vradi.actions.SearchAction"> + <result>/WEB-INF/jsp/empty.jsp</result> + </action> + <!-- | genere la grille des resultats +--> <action name="search" class="org.chorem.vradi.actions.SearchAction"> <result>/WEB-INF/jsp/resultGrid.jsp</result> </action> - <!-- - | genere le bouton d'activation des queries - +--> - <action name="activeQuery" class="org.chorem.vradi.actions.SearchAction"> - <result>/WEB-INF/jsp/activeQuery.jsp</result> - </action> <!-- - | Switch query activation - +--> - <action name="switchQueryActivation" method="switchQueryActivation" class="org.chorem.vradi.actions.SearchAction"> - <param name="query"/> - <param name="queryName"/> - <result>/WEB-INF/jsp/activeQuery.jsp</result> - </action> - - <!-- | Save query +--> <action name="savedQuery" class="org.chorem.vradi.actions.SavedQueriesAction"> Deleted: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/activeQuery.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/activeQuery.jsp 2011-06-22 09:37:50 UTC (rev 90) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/activeQuery.jsp 2011-06-24 09:54:38 UTC (rev 91) @@ -1,39 +0,0 @@ -<%@ page import="org.chorem.vradi.actions.SearchAction" %> -<%@ page import="com.opensymphony.xwork2.ActionContext" %> -<%@taglib prefix="s" uri="/struts-tags"%> -<%@taglib prefix="sj" uri="/struts-jquery-tags" %> - -<% -SearchAction action = SearchAction.getAction(); -String query = action.getQuery(); -String queryName = action.getQueryName(); -boolean queryActive = action.isQueryActive(); -ActionContext.getContext().put("queryActive", queryActive); -ActionContext.getContext().put("query", query); -ActionContext.getContext().put("queryName", queryName); -%> - -<s:url id="switchQueryUrl" action="switchQueryActivation"> - <s:param name="query"> - <s:property value="query"/> - </s:param> - <s:param name="queryName"> - <s:property value="queryName"/> - </s:param> -</s:url> - -<s:set id="queryActiveText"> - <s:if test="queryActive"> - <s:text name="vradi.search.unActivateQuery"/> - </s:if> - <s:else> - <s:text name="vradi.search.activateQuery"/> - </s:else> -</s:set> - -<sj:submit id="swithActivateQuery" - href="%{switchQueryUrl}" - value="%{queryActiveText}" - indicator="indicator-activeQuery" - targets="activeQueryPanel" - button="true"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-06-22 09:37:50 UTC (rev 90) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-06-24 09:54:38 UTC (rev 91) @@ -24,7 +24,6 @@ emptyOption="true" onChangeTopics="doUpdateForm"/> - <%--onSuccessTopics="updateForm"--%> <sj:submit id="doUpdateFormSubmit" cssClass="hidden" listenTopics="doUpdateForm" Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-06-22 09:37:50 UTC (rev 90) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-06-24 09:54:38 UTC (rev 91) @@ -8,8 +8,10 @@ SearchAction action = SearchAction.getAction(); String query = action.getQuery(); String queryName = action.getQueryName(); +boolean queryActive = action.isQueryActive(); ActionContext.getContext().put("query", query); ActionContext.getContext().put("queryName", queryName); +ActionContext.getContext().put("queryActive", queryActive); %> <s:form id="searchForm" action="search"> @@ -44,10 +46,24 @@ onCompleteTopics="updateQueries" button="true"/> - <sj:div id="activeQueryPanel" href="/fragment/activeQuery.action" indicator="indicator-activeQuery"> - <img id="indicator-activeQuery" src="/img/indicator.gif" alt="Loading..." style="display:none"/> - </sj:div> + <s:url id="switchQueryUrl" value="/fragment/switchQueryActivation.action"/> + <s:set id="queryActiveText"> + <s:if test="queryActive"> + <s:text name="vradi.search.unActivateQuery"/> + </s:if> + <s:else> + <s:text name="vradi.search.activateQuery"/> + </s:else> + </s:set> + + <sj:submit id="swithActivateQuery" + href="%{switchQueryUrl}" + value="%{queryActiveText}" + targets="empty" + onCompleteTopics="doUpdateForm" + button="true"/> + <s:set id="searchText"> <s:text name="vradi.search.submit"/> </s:set>