Author: sletellier Date: 2011-06-29 16:30:46 +0200 (Wed, 29 Jun 2011) New Revision: 105 Url: http://chorem.org/repositories/revision/vradi/105 Log: Revert formNote modifications Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-06-29 14:09:29 UTC (rev 104) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-06-29 14:30:46 UTC (rev 105) @@ -6,15 +6,11 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.vradi.entities.Attachment; import org.chorem.vradi.entities.FormNote; import org.chorem.vradi.entities.FormNoteImpl; import org.chorem.vradi.entities.VradiUser; import org.nuiton.jrst.JRST; import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.search.Search; /** * Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-06-29 14:09:29 UTC (rev 104) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-06-29 14:30:46 UTC (rev 105) @@ -79,12 +79,10 @@ collapsible="true" useSelectedTabCookie="true"> <sj:tab id="tabHtmlSummary" target="htmlSummary" label="Summary"/> <sj:tab id="tabHtmlSummaryEdit" target="htmlSummaryEdit" label="Edit"/> - <sj:div id="htmlSummary" - href="/ajax/rst.action?id=%{localNoteId}&field=%{localFieldSummary}" - listenTopics="topicHtmlSummary"> + <div id="htmlSummary"> <img id="indicator-htmlSummary" src="/img/indicator.gif" alt="Loading..." style="display:none"/> <%=action.getSummary()%> - </sj:div> + </div> <div id="htmlSummaryEdit"> <form id="htmlSummaryEditForm" action="/ajax/rst.action"> <s:hidden name="id" value="%{localNoteId}"/> @@ -92,8 +90,7 @@ <s:textarea name="rst" value="%{localSummary}"/> <sj:submit id="htmlSummaryEditSubmit" value="Save" - targets="result" - onClickTopics="topicHtmlSummary" indicator="indicator-htmlSummary" + targets="htmlSummary" indicator="indicator-htmlSummary" button="true" buttonIcon="ui-icon-gear"/> </form> </div> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp 2011-06-29 14:09:29 UTC (rev 104) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp 2011-06-29 14:30:46 UTC (rev 105) @@ -11,7 +11,7 @@ * Format a Column as Link */ function formatLink(cellvalue, options, row) { - return "<a href='/formNote/" + cellvalue + ".action'><%=_("vradi.form.editAction")%></a>"; + return "<a href='/formNoteList/" + cellvalue + ".action'><%=_("vradi.form.editAction")%></a>"; } </script>