Author: mfortun Date: 2011-05-10 11:13:45 +0200 (Tue, 10 May 2011) New Revision: 882 Url: http://nuiton.org/repositories/revision/wikitty/882 Log: * improve view with struts direct mapping field<->attribute Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-10 07:57:31 UTC (rev 881) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-10 09:13:45 UTC (rev 882) @@ -11,9 +11,10 @@ protected PagedResult<Wikitty> pagedResult; protected Wikitty wikittyResult; - protected String search; - protected String first; - protected String end; + protected String search = "*"; + protected int first = 0; + protected int end = 100; + /** @@ -29,12 +30,12 @@ @Override public String execute() throws Exception { + System.out.println(search); + //search = this.getArgument("r", "*"); + //first = this.getArgument("first", "0"); + //end = this.getArgument("end", "100"); - search = this.getArgument("r", "*"); - first = this.getArgument("first", "0"); - end = this.getArgument("end", "100"); - String id = getArgument("id", ""); System.out.println(id); if (!"".equals(id)) { @@ -50,8 +51,8 @@ String r = search; - int firstIndex = Integer.parseInt(first); - int endIndex = Integer.parseInt(end); + int firstIndex = first; + int endIndex = end; Criteria criteria = Search.query().keyword(r).criteria(); criteria.setFirstIndex(firstIndex); @@ -85,23 +86,30 @@ this.search = search; } - public String getFirst() { + + + public int getFirst() { return first; } - public void setFirst(String first) { + public void setFirst(int first) { this.first = first; } - public String getEnd() { + public int getEnd() { return end; } - public void setEnd(String end) { + public void setEnd(int end) { this.end = end; } + public String makeUrlEdit(Wikitty w){ + + String result = getArgument("context", "")+"/edit.action?id="+w.getId(); + + return result; + + } - - } Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-10 07:57:31 UTC (rev 881) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-10 09:13:45 UTC (rev 882) @@ -41,7 +41,7 @@ import="org.nuiton.wikitty.publication.WikittyPublicationContext"%> <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> - +<%@taglib prefix="s" uri="/struts-tags"%> <h1>Wikitty View</h1> <% @@ -68,21 +68,18 @@ %> <% -if (wikit!=null){ - out.print(wikit); -} - + if (wikit != null) { + out.print(wikit); + } %> <form action="view.action" method="post"> <div> - <textarea name="r" rows="4" cols="20"><%=action.getSearch()%></textarea> + <textarea title="Search" name="search"><%=action.getSearch()%></textarea> </div> - <label for="first">First</label> <input type="text" name="first" - value="<%=action.getFirst()%>" /> <label for="first">End</label> - <input type="text" name="end" - value="<%=action.getEnd()%>" /> <input type="submit" - name="id" value="Search" /> + <s:textfield label="First" key="first" name="first" /> + <s:textfield label="End" key="end" name="end" /> + <input type="submit" name="id" value="Search" /> <pre> </pre> @@ -92,8 +89,10 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><a">edit</a></td> - <td><input type="submit" name="id" value="<%=w.getId()%>" /></td> + <td><a href="<%=action.makeUrlEdit(w)%>">edit</a> + </td> + <td><input type="submit" name="id" value="<%=w.getId()%>" /> + </td> <td><%=w.getExtensionNames()%></td> </tr> <%