Author: vbriand Date: 2011-04-22 14:36:51 +0200 (Fri, 22 Apr 2011) New Revision: 106 Url: http://chorem.org/repositories/revision/chorem/106 Log: The project's description can now be modified Added: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-22 12:21:24 UTC (rev 105) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-22 12:36:51 UTC (rev 106) @@ -124,6 +124,17 @@ return result; } + public String modify() { + String result = SUCCESS; + Project project; + ChoremProxy proxy = getChoremProxy(); + + project = proxy.restore(Project.class, projectId); + project.setDescription(description); + proxy.store(project); + return result; + } + protected int yearInt; protected String year; protected String name; Added: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml (rev 0) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml 2011-04-22 12:36:51 UTC (rev 106) @@ -0,0 +1,11 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + +<validators> + <field name="description"> + <field-validator type="requiredstring"> + <message key="chorem.field.required" /> + </field-validator> + </field> +</validators> Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 12:21:24 UTC (rev 105) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 12:36:51 UTC (rev 106) @@ -122,6 +122,14 @@ <result name="error" type="redirectAction">home</result> <result>/WEB-INF/jsp/gepeto/projectDetails.jsp</result> </action> + <action name="modifyProject" class="org.chorem.gepeto.action.ProjectAction" method="modify"> + <result name="input">/WEB-INF/jsp/gepeto/projectDetails.jsp</result> + <result type="redirectAction"> + <param name="actionName">projectDetails</param> + <param name="namespace">/gepeto</param> + <param name="projectId">${projectId}</param> + </result> + </action> </package> <package name="billy" namespace="/billy" extends="struts-default"> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-22 12:21:24 UTC (rev 105) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-22 12:36:51 UTC (rev 106) @@ -25,17 +25,19 @@ <s:param name="companyId"><%= CompanyAction.getAction().getCompanyId() %></s:param> </s:url> <form action="${modifyCompany}" method="post"> - <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " /> - <br /> - <br /> - <s:textarea key="chorem.bonzoms.company.address" name="address" cols="30" rows="3" labelposition="top" /> - <br /> - <s:textfield key="chorem.bonzoms.company.phoneNb" name="phoneNb" labelSeparator=": " /> - <br /> - <s:textfield key="chorem.bonzoms.company.website" name="website" labelSeparator=": " /> - <br /> - <br /> - <s:submit key="chorem.misc.modify" name="modify" /> + <p> + <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " /> + <br /> + <br /> + <s:textarea key="chorem.bonzoms.company.address" name="address" cols="30" rows="3" labelposition="top" /> + <br /> + <s:textfield key="chorem.bonzoms.company.phoneNb" name="phoneNb" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.company.website" name="website" labelSeparator=": " /> + <br /> + <br /> + <s:submit key="chorem.misc.modify" name="modify" /> + </p> </form> <br /> <br /> 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-22 12:21:24 UTC (rev 105) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-22 12:36:51 UTC (rev 106) @@ -21,16 +21,22 @@ <s:param><%= ProjectAction.getAction().getName() %></s:param> </s:text> </h2> + <s:url namespace="/gepeto" action="modifyProject" var="modifyProject"> + <s:param name="projectId"><%= ProjectAction.getAction().getProjectId() %></s:param> + </s:url> + <form action="${modifyProject}" method="post"> + <p> + <s:textarea name="description" key="chorem.gepeto.project.description" cols="50" rows="10" labelposition="top" /> + <br /> + <br /> + <s:url namespace="/billy" action="addQuotationInput" var="addQuotation"> + <s:param name="projectId"><%= ProjectAction.getAction().getProjectId() %></s:param> + </s:url> + <s:submit key="chorem.misc.modify" name="modify" /> + </p> + </form> + <a href="${addQuotation}"><s:text name="chorem.billy.quotation.add" /></a> <p> - <s:textarea readonly="true" name="description" key="chorem.gepeto.project.description" cols="50" rows="10" labelposition="top" /> - <br /> - <br /> - <s:url namespace="/billy" action="addQuotationInput" var="addQuotation"> - <s:param name="projectId"><%= ProjectAction.getAction().getProjectId() %></s:param> - </s:url> - <a href="${addQuotation}"><s:text name="chorem.billy.quotation.add" /></a> - </p> - <p> <s:text name="chorem.gepeto.projectDetails.projectOrders" /> <br /> <br />