Author: vbriand Date: 2011-04-08 10:51:36 +0200 (Fri, 08 Apr 2011) New Revision: 67 Url: http://chorem.org/repositories/revision/chorem/67 Log: When a project order is added to a quotation, the user is now redirected to the quotation's page instead of the home page Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-08 08:38:00 UTC (rev 66) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-08 08:51:36 UTC (rev 67) @@ -96,6 +96,7 @@ chorem.gepeto.project.description.required=You must describe the project chorem.gepeto.project.name=Project''s name chorem.gepeto.project.name.required=You must enter the project''s name +chorem.gepeto.projectDetails.noQuotations=No quotations chorem.gepeto.projectDetails.quotation=Quotation of {0} (ref. {1}) chorem.gepeto.projectDetails.quotationWithProjectOrder=Project''s quotation with project order chorem.gepeto.projectDetails.quotationsWithoutProjectOrder=Project''s quotations without project order Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-08 08:38:00 UTC (rev 66) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-08 08:51:36 UTC (rev 67) @@ -91,6 +91,7 @@ chorem.gepeto.project.description.required=Vous devez d\u00E9crire le projet chorem.gepeto.project.name=Nom du projet chorem.gepeto.project.name.required=Vous devez renseigner un nom pour le projet +chorem.gepeto.projectDetails.noQuotations=Pas de devis chorem.gepeto.projectDetails.quotation=Devis du {0} (r\u00E9f. {1}) chorem.gepeto.projectDetails.quotationWithProjectOrder=Devis du projet avec un contrat chorem.gepeto.projectDetails.quotationsWithoutProjectOrder=Devis du projet sans contrat Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-08 08:38:00 UTC (rev 66) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-08 08:51:36 UTC (rev 67) @@ -83,7 +83,11 @@ <action name="addProjectOrder" class="org.chorem.gepeto.action.ProjectOrderAction" method="add"> <result name="input">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> <result name="error">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> - <result type="redirectAction">home</result> + <result type="redirectAction"> + <param name="actionName">quotationDetails</param> + <param name="namespace">/billy</param> + <param name="quotationId">${quotationId}</param> + </result> </action> <action name="getProjectsByYear" class="org.chorem.gepeto.action.ProjectAction"> <result>/WEB-INF/jsp/gepeto/projectsByYear.jsp</result> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-08 08:38:00 UTC (rev 66) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-08 08:51:36 UTC (rev 67) @@ -36,6 +36,11 @@ <% List<Quotation> quotationsProjectOrder = ProjectAction.getAction().getAttachedQuotationsWithProjectOrder(); + if (quotationsProjectOrder.isEmpty()) { + %> + <s:text name="chorem.gepeto.projectDetails.noQuotations" /><br /> + <% + } for (Quotation quotation : quotationsProjectOrder) { %> <s:url namespace="/billy" action="quotationDetails" var="quotationDetails"> @@ -58,6 +63,11 @@ <% List<Quotation> quotations = ProjectAction.getAction().getAttachedQuotationsWithoutProjectOrder(); + if (quotations.isEmpty()) { + %> + <s:text name="chorem.gepeto.projectDetails.noQuotations" /><br /> + <% + } for (Quotation quotation : quotations) { %> <s:url namespace="/billy" action="quotationDetails" var="quotationDetails">