Author: sletellier Date: 2011-10-11 17:25:11 +0200 (Tue, 11 Oct 2011) New Revision: 138 Url: http://chorem.org/repositories/revision/vradi/138 Log: - Remove static getAction method - Clean all jsp pages to only use tags Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/DeleteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SeekPartnersAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -25,10 +25,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(AttachmentListAction.class); - static public AttachmentListAction getAction() { - return (AttachmentListAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String targetId; /** les fichiers attache a ce target */ protected PagedResult<Attachment> attachments; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/DeleteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/DeleteAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/DeleteAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -20,10 +20,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(DeleteAction.class); - static public DeleteAction getAction() { - return (DeleteAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String id; public void setId(String id) { Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -21,10 +21,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(EditAction.class); - static public EditAction getAction() { - return (EditAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - /** restraint les modifications possibles sur certaine extension */ protected HttpServletRequest request; protected String id; 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-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -25,10 +25,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(FormNoteAction.class); - - static public FormNoteAction getAction() { - return (FormNoteAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } /** used form new formNote */ protected String formId; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -23,10 +23,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(FormNoteListAction.class); - static public FormNoteListAction getAction() { - return (FormNoteListAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String formId; protected PagedResult<FormNote> formNotes; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -35,10 +35,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(RestoreUserAction.class); - static public RestoreUserAction getAction() { - return (RestoreUserAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String userId; protected VradiUser user; protected String infoHtml; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -20,10 +20,6 @@ */ public class SavedQueriesAction extends VradiBaseAction implements ServletRequestAware { - static public SavedQueriesAction getAction() { - return (SavedQueriesAction) ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected HttpServletRequest request; protected List<Query> lastQueries; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SeekPartnersAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SeekPartnersAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SeekPartnersAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -27,10 +27,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(SeekPartnersAction.class); - static public SeekPartnersAction getAction() { - return (SeekPartnersAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String noteId; protected FormNote note; protected Set<VradiUser> partners; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -32,10 +32,6 @@ static private Log log = LogFactory.getLog(SendInvitationAction.class); public static final String SHOW_INVITATION_ACTION = "showInvitation"; - static public SendInvitationAction getAction() { - return (SendInvitationAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected String noteId; protected boolean formReceiver; protected boolean seeker; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -34,10 +34,6 @@ static private Log log = LogFactory.getLog(ShowInvitationAction.class); public static final String SHOW_RESULT_INVITATION_ACTION = "showInvitationResult"; - static public ShowInvitationAction getAction() { - return (ShowInvitationAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected HttpServletRequest request; protected String p; protected String noteId; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -26,10 +26,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(ShowInvitationAction.class); - static public ShowInvitationResultAction getAction() { - return (ShowInvitationResultAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected HttpServletRequest request; protected String p; protected String noteId; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -24,10 +24,6 @@ private static final long serialVersionUID = -2886756982077980790L; - static public ThesaurusAction getAction() { - return (ThesaurusAction) ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - public static final String THESAURUS_NAME_REQUEST = "thesaurusNameRequest"; protected List<TreeNode> nodes = new ArrayList<TreeNode>(); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-10-11 15:25:11 UTC (rev 138) @@ -2,10 +2,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + +import java.util.Date; import java.util.Map; import org.apache.struts2.interceptor.SessionAware; import org.chorem.vradi.VradiSession; import org.chorem.vradi.VradiWebConfig; +import org.chorem.vradi.VradiWebHelper; import org.chorem.vradi.entities.VradiUser; import org.chorem.vradi.services.VradiDataService; import org.nuiton.util.ApplicationConfig; @@ -24,17 +27,6 @@ protected static final Log log = LogFactory.getLog(VradiBaseAction.class); - /** - * Key to find current action in context. - * child can have method - * <pre> - * static public ChildAction getAction() { - * return (ChildAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); - * } - * </pre> - */ - protected static final String CONTEXT_ACTION_KEY = "action"; - protected static final String CONTEXT_SELECTED_QUERY_KEY = "selectedQuery"; protected transient Map<String, Object> session; @@ -69,4 +61,8 @@ public ApplicationConfig getConfig() { return VradiWebConfig.getConfig(); } + + public String formatDate(Date date) { + return VradiWebHelper.formatDate(date); + } } \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,33 +4,22 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@page import="org.chorem.vradi.entities.Attachment"%> -<%@page import="org.chorem.vradi.actions.AttachmentListAction"%> -<%@ page import="org.chorem.vradi.VradiWebHelper" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -AttachmentListAction action = AttachmentListAction.getAction(); -%> - <div id="actionResult" hidden="true"> <img id="indicator-deleteAttachment" src="/img/indicator.gif" alt="deleting..." style="display:none"/> </div> <ul> - <% for (Attachment a : action.getAttachments()) { - if (a != null) { - String attachmentId = a.getWikittyId(); - ActionContext.getContext().put("localAttachmentId", attachmentId); - %> + <s:iterator value="attachments" var="attachment"> + <li> + <s:set name="formatedDate" value="%{formatDate(#attachment.date)}"/> + <s:property value="#formatedDate"/> <s:a action="raw/%{attachment.wikittyId}/Attachment.content" namespace="/ajax"><s:property value="%{attachment.name}"/></s:a> - <li><%=VradiWebHelper.formatDate(a.getDate())%> <s:a action="raw/%{localAttachmentId}/Attachment.content" namespace="/ajax"><%=a.getName()%></s:a> - - <s:url id="deleteUrl" action="delete/%{localAttachmentId}" namespace="/ajax"/> + <s:url id="deleteUrl" action="delete/%{attachment.wikittyId}" namespace="/ajax"/> <sj:a href="%{deleteUrl}" targets="actionResult" button="true" @@ -40,6 +29,5 @@ <s:text name="vradi.attachment.delete"/> </sj:a> </li> - <% } - } %> + </s:iterator> </ul> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,9 +4,7 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.FormNote"%> -<%@page import="org.chorem.vradi.actions.FormNoteAction"%> <%@ page import="org.chorem.vradi.entities.FormNoteState" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> @@ -14,21 +12,11 @@ <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -FormNoteAction action = FormNoteAction.getAction(); -FormNote formNote = action.getFormNote(); - -ActionContext.getContext().put("localNoteId", formNote.getWikittyId()); -ActionContext.getContext().put("localFieldSummary", FormNote.FQ_FIELD_FORMNOTE_SUMMARY); -ActionContext.getContext().put("localFieldContent", FormNote.FQ_FIELD_FORMNOTE_CONTENT); -ActionContext.getContext().put("localNote", formNote); -ActionContext.getContext().put("localSeekingPartner", formNote.getSeekingPartner()); -ActionContext.getContext().put("localSummary", formNote.getSummary()); -ActionContext.getContext().put("localContent", formNote.getContent()); -%> - <!DOCTYPE html> <html> + <s:set name="localNoteId" value="formNote.wikittyId"/> + <s:set name="localFieldSummary"><%=FormNote.FQ_FIELD_FORMNOTE_SUMMARY%></s:set> + <s:set name="localFieldContent"><%=FormNote.FQ_FIELD_FORMNOTE_CONTENT%></s:set> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="vradi.formNote.title" /></title> @@ -36,7 +24,7 @@ <sj:head jquerytheme="sunny"/> <script type="text/javascript"> function seekingPartnersChange(checkbox) { - var url="<s:url action='edit/%{localNoteId}' namespace='/ajax'/>"; + var url="<s:url action='edit/#localNoteId' namespace='/ajax'/>"; url = url + "?<%=FormNote.FQ_FIELD_FORMNOTE_SEEKINGPARTNER%>=" + checkbox.checked; var xhr=new XMLHttpRequest(); xhr.open('GET', url, true); @@ -51,7 +39,7 @@ </div> <div> <s:url id="closeButtonUrl" - action="edit/%{localNoteId}" + action="edit/#localNoteId" namespace="/ajax"> <s:param name="state"> <%=FormNoteState.CLOSE.getValue()%> @@ -63,16 +51,16 @@ <s:text name="vradi.formNote.close"/> </sj:a> - <s:url id="deleteUrl" action="delete/%{localNoteId}" namespace="/ajax"/> + <s:url id="deleteUrl" action="delete/#localNoteId" namespace="/ajax"/> <sj:a href="%{deleteUrl}" targets="result" indicator="indicator-result" button="true" buttonIcon="ui-icon-gear"><s:text name="vradi.delete"/></sj:a> </div> <div> - <% for (String h : formNote.getHistory()) { %> - <div><%=h%></div> - <% } %> + <s:iterator value="formNote.history" var="h"> + <div><s:property value="#h"/></div> + </s:iterator> </div> <div> @@ -99,7 +87,7 @@ <s:text name="vradi.formNote.seekingPartner"/> </s:set> <s:checkbox label="%{seekingPartnerText}" - name="formNote.seekingPartners" value="%{localSeekingPartner}" + name="formNote.seekingPartners" value="formNote.seekingPartner" onchange="seekingPartnersChange(this);"/> </div> @@ -133,7 +121,7 @@ <s:form id="htmlSummaryEditForm" action="rst" namespace="/ajax"> <s:hidden name="id" value="%{localNoteId}"/> <s:hidden name="field" value="%{localFieldSummary}"/> - <s:textarea name="rst" value="%{localSummary}"/> + <s:textarea name="rst" value="%{formNote.summary}"/> <sj:submit id="htmlSummaryEditSubmit" value="%{saveText}" targets="result" @@ -163,7 +151,7 @@ <s:form id="htmlContentEditForm" action="rst" namespace="/ajax"> <s:hidden name="id" value="%{localNoteId}"/> <s:hidden name="field" value="%{localFieldContent}"/> - <s:textarea name="rst" value="%{localContent}"/> + <s:textarea name="rst" value="%{formNote.content}"/> <sj:submit id="htmlContentEditSubmit" value="%{saveText}" targets="result" Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,17 +4,9 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@page import="org.chorem.vradi.entities.FormNote"%> -<%@page import="org.chorem.vradi.actions.FormNoteListAction"%> -<%@ page import="org.chorem.vradi.VradiWebHelper" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<% -FormNoteListAction action = FormNoteListAction.getAction(); -%> - <!DOCTYPE html> <html> <head> @@ -25,11 +17,13 @@ <h1><s:text name="vradi.formNoteList.title" /></h1> <ul> - <% for (FormNote note : action.getFormNotes()) { - ActionContext.getContext().put("localNoteId", note.getWikittyId()); - %> - <li><s:a action="formNote/%{localNoteId}" namespace="/"><%=VradiWebHelper.formatDate(note.getCreationDate())%> <%=note.getSummary()%></s:a></li> - <% } %> + <s:iterator value="formNotes" var="note"> + <s:set name="formatedDate" value="%{formatDate(#note.creationDate)}"/> + <li><s:a action="formNote/%{note.wikittyId}" namespace="/"> + <s:property value="formatedDate"/><s:property value="summary"/> + </s:a> + </li> + </s:iterator> <li><s:a action="formNote/new?formId=%{formId}" namespace="/"><s:text name="vradi.new.formNote"/></s:a></li> </ul> </body> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -1,28 +1,18 @@ -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@ page import="org.chorem.vradi.actions.ShowInvitationAction" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<% -ShowInvitationAction action = ShowInvitationAction.getAction(); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localSenderId", action.getSenderId()); -ActionContext.getContext().put("invitationResult", action.getInvitationResult()); -ActionContext.getContext().put("message", action.getMessage()); -%> +<h1><s:property value="title"/></h1> -<h1><%=action.getTitle()%></h1> - <div> - <p><%=action.getContent()%></p> + <p><s:property value="%{action.content}"/></p> </div> <s:form action="sendInvitationResult" namespace="/" theme="simple"> - <s:hidden name="noteId" value="%{localNoteId}"/> - <s:hidden name="senderId" value="%{localSenderId}"/> - <s:hidden name="invitationResult" value="%{invitationResult}"/> - <s:hidden name="message" value="%{message}"/> + <s:hidden name="noteId"/> + <s:hidden name="senderId"/> + <s:hidden name="invitationResult"/> + <s:hidden name="message"/> <s:textarea name="messageResult"/> <s:submit id="acceptButton" key="vradi.send"/> </s:form> \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -1,30 +1,19 @@ -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@ page import="org.chorem.vradi.actions.ShowInvitationResultAction" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<% -ShowInvitationResultAction action = ShowInvitationResultAction.getAction(); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localSenderId", action.getSenderId()); -ActionContext.getContext().put("invitationResult", action.getInvitationResult()); -ActionContext.getContext().put("message", action.getMessage()); -ActionContext.getContext().put("messageResult", action.getMessageResult()); -%> +<h1><s:property value="title"/></h1> -<h1><%=action.getTitle()%></h1> - <div> - <p><%=action.getContent()%></p> + <p><s:property value="content"/></p> </div> <s:form action="sendInvitationResultConfirm" namespace="/" theme="simple"> - <s:hidden name="noteId" value="%{localNoteId}"/> - <s:hidden name="senderId" value="%{localSenderId}"/> - <s:hidden name="invitationResult" value="%{invitationResult}"/> - <s:hidden name="message" value="%{message}"/> - <s:hidden name="messageResult" value="%{messageResult}"/> + <s:hidden name="noteId"/> + <s:hidden name="senderId"/> + <s:hidden name="invitationResult"/> + <s:hidden name="message"/> + <s:hidden name="messageResult"/> <s:textarea name="messageConfirmResult"/> <s:submit id="acceptButton" key="vradi.send"/> </s:form> \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -1,16 +1,6 @@ -<%@ page import="com.opensymphony.xwork2.ActionContext" %> -<%@ page import="org.chorem.vradi.entities.Query" %> -<%@ page import="java.util.List" %> -<%@ page import="org.chorem.vradi.actions.SavedQueriesAction" %> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags" %> -<% -SavedQueriesAction action = SavedQueriesAction.getAction(); -List<Query> lastQueries = action.getLastQueries(); -ActionContext.getContext().put("lastQueries", lastQueries); -%> - <s:form id="queryForm" action="searchPanel" namespace="/fragment"> <s:url id="savedQueries" action="savedQueries" namespace="/ajax"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,21 +4,11 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@page import="org.chorem.vradi.actions.SeekPartnersAction"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -SeekPartnersAction action = SeekPartnersAction.getAction(); -ActionContext.getContext().put("localPartners", action.getPartners()); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localNoteSummary", action.getNote().getSummary()); - -%> - <!DOCTYPE html> <html> <head> @@ -31,13 +21,13 @@ <h1><s:text name="vradi.seekingPartners.title" /></h1> <s:form id="seekingPartnersForm" action="sendInvitation" namespace="/" method="POST"> - <s:hidden name="noteId" value="%{localNoteId}"/> + <s:hidden name="noteId"/> <s:checkbox name="formReceiver" key="vradi.seekingPartners.formReceiver"/> <s:checkbox name="seeker" key="vradi.seekingPartners.seeker"/> <s:checkbox name="partners" key="vradi.seekingPartners.partners"/> - <s:select size="5" multiple="true" name="userId" list="%{localPartners}" listKey="wikittyId" listValue="login"/> + <s:select size="5" multiple="true" name="userId" list="%{partners}" listKey="wikittyId" listValue="login"/> - <s:set id="showText"> + <s:set var="showText"> <s:text name="vradi.show"/> </s:set> @@ -57,7 +47,7 @@ <s:textarea name="message" value="%{localNoteSummary}" key="vradi.userPreference.info"/> - <s:set id="sendText"> + <s:set var="sendText"> <s:text name="vradi.send"/> </s:set> <s:submit value="%{sendText}"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,17 +4,11 @@ Author : poussin --%> -<%@page import="org.chorem.vradi.actions.SendInvitationAction"%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -SendInvitationAction action = SendInvitationAction.getAction(); -%> - <!DOCTYPE html> <html> <head> @@ -25,6 +19,6 @@ </head> <body> <h1><s:text name="vradi.sendInvitation.title" /></h1> - <s:text name="vradi.sendInvitation.count" />: <%=action.getSendCount()%> + <s:text name="vradi.sendInvitation.count" />: <s:property value="sendCount"/> </body> </html> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,20 +4,11 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@page import="org.chorem.vradi.actions.ShowInvitationAction"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -ShowInvitationAction action = ShowInvitationAction.getAction(); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localSenderId", action.getSender().getWikittyId()); -ActionContext.getContext().put("message", action.getMessage()); -%> - <!DOCTYPE html> <html> <head> @@ -27,12 +18,13 @@ <sj:head jquerytheme="sunny"/> </head> <body> + <s:set name="sender" value="sender"/> <h1><s:text name="vradi.showInvitation.title" /></h1> <div> - <s:text name="vradi.showInvitation.from"/><%=action.getSender().getLogin()%> + <s:text name="vradi.showInvitation.from"/><s:property value="#sender.login"/> <p> - <%=action.getSenderInfo()%> + <s:property value="senderInfo" escapeHtml="false"/> </p> </div> @@ -41,7 +33,7 @@ <form id="partnersForm" action="fragment/userInfo.action" namespace="/"> <s:select size="5" name="userId" list="partners" listKey="wikittyId" listValue="login"/> - <s:set id="showText"> + <s:set var="showText"> <s:text name="vradi.show"/> </s:set> <sj:submit id="partnersSubmit" @@ -57,14 +49,14 @@ <div> <s:text name="vradi.showInvitation.requestMsg"/> - <p><%=action.getMessageRST()%></p> + <p><s:property value="messageRST" escapeHtml="false"/></p> </div> <div> <s:form id="form" namespace="/fragment" action="invitationResult"> - <s:hidden name="noteId" value="%{localNoteId}"/> - <s:hidden name="senderId" value="%{localSenderId}"/> - <s:hidden name="message" value="%{message}"/> + <s:hidden name="noteId"/> + <s:hidden name="senderId" value="%{sender.wikittyId}"/> + <s:hidden name="message"/> <s:url id="invitationResultUrl" namespace="/ajax" action="invitationResultButtons"/> <sj:radio href="%{invitationResultUrl}" Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,21 +4,11 @@ Author : poussin --%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@ page import="org.chorem.vradi.actions.ShowInvitationResultAction" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> -<% -ShowInvitationResultAction action = ShowInvitationResultAction.getAction(); -ActionContext.getContext().put("localNoteId", action.getNoteId()); -ActionContext.getContext().put("localSenderId", action.getSender().getWikittyId()); -ActionContext.getContext().put("message", action.getMessage()); -ActionContext.getContext().put("messageResult", action.getMessageResult()); -%> - <!DOCTYPE html> <html> <head> @@ -31,30 +21,35 @@ <h1><s:text name="vradi.showInvitationConfirm.title" /></h1> <div> - <s:text name="vradi.showInvitationConfirm.from"/><%=action.getSender().getLogin()%> + <s:set name="sender" value="sender"/> + <s:text name="vradi.showInvitationConfirm.from"/><s:property value="%{sender.login}"/> <p> - <%=action.getSenderInfo()%> + <s:property value="senderInfo" escapeHtml="false"/> </p> </div> <div> <s:text name="vradi.showInvitationConfirm.requestMsg"/> - <p><%=action.getMessageRST()%></p> + <p> + <s:property value="messageRST" escapeHtml="false"/> + </p> </div> <div> <s:text name="vradi.showInvitationConfirm.requestConfirmMsg"/> - <p><%=action.getMessageResultRST()%></p> + <p> + <s:property value="messageRST" escapeHtml="false"/> + </p> </div> <div> <s:form id="form" namespace="/fragment" action="invitationResultConfirm"> - <s:hidden name="noteId" value="%{localNoteId}"/> - <s:hidden name="senderId" value="%{localSenderId}"/> - <s:hidden name="message" value="%{message}"/> - <s:hidden name="messageResult" value="%{messageResult}"/> + <s:hidden name="noteId"/> + <s:hidden name="senderId" value="%{sender.wikittyId}"/> + <s:hidden name="message"/> + <s:hidden name="messageResult"/> <s:url id="invitationResultConfirmUrl" namespace="/ajax" action="invitationResultConfirmButtons"/> <sj:radio href="%{invitationResultConfirmUrl}" Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,24 +4,10 @@ Author : poussin --%> -<%@page import="org.chorem.vradi.actions.RestoreUserAction"%> -<%@page import="org.chorem.vradi.entities.VradiUser"%> -<%@ page import="static org.nuiton.i18n.I18n._" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<% -RestoreUserAction action = RestoreUserAction.getAction(); -VradiUser user = action.getUser(); -String email = _("vradi.noEmail"); -String info = action.getInfoHtml(); -if (user != null) { - email = user.getLogin(); - info = action.getInfoHtml(); -} -%> +<a href="mailto:${user.email}"><s:property value="%{user.email}"/></a> -<a href="mailto:<%=email%>"><%=email%></a> - -<div><%=info%></div> \ No newline at end of file +<div><s:property value="infoHtml" escapeHtml="false"/></div> \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-10-11 13:07:34 UTC (rev 137) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-10-11 15:25:11 UTC (rev 138) @@ -4,8 +4,6 @@ Author : poussin --%> -<%@page import="org.chorem.vradi.actions.RestoreUserAction"%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.VradiUser"%> <%@ page import="org.chorem.vradi.entities.Infogene" %> <%@ page import="static org.nuiton.i18n.I18n._" %> @@ -16,18 +14,6 @@ <%@ taglib prefix="ws" uri="/wikitty-struts" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> -<% -RestoreUserAction action = RestoreUserAction.getAction(); -VradiUser user = action.getUser(); -ActionContext.getContext().put("localUserId", user.getWikittyId()); -ActionContext.getContext().put("localUserEmail", user.getLogin()); -ActionContext.getContext().put("localUserInfo", user.getInfo()); -ActionContext.getContext().put("localUserNoSend", user.getNoSend()); -ActionContext.getContext().put("localUserNoReceived", user.getNoReceived()); - -ActionContext.getContext().put("localVradiUserFieldInfo", VradiUser.FQ_FIELD_VRADIUSER_INFO); -%> - <!DOCTYPE html> <html> <head> @@ -60,6 +46,15 @@ </head> <body> + <s:set name="fielUserInfo"><%=VradiUser.FQ_FIELD_VRADIUSER_INFO%></s:set> + <s:set name="fqFieldUserLogin"><%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%></s:set> + <s:set name="fqFieldNoSend"><%=VradiUser.FQ_FIELD_VRADIUSER_NOSEND%></s:set> + <s:set name="fqFieldNoReceived"><%=VradiUser.FQ_FIELD_VRADIUSER_NORECEIVED%></s:set> + + <s:set name="user" value="user"/> + <s:set name="localUserId" value="%{user.wikittyId}"/> + <s:set name="proxy" value="%{getProxy()}"/> + <h1><s:text name="vradi.userPreference.title" /></h1> <div id="actionResult" style="display: none;"></div> @@ -69,11 +64,11 @@ +--> <div> <s:form id="infoForm" action="edit/%{localUserId}" namespace="/ajax" method="POST"> - <sj:textarea name="%{localVradiUserFieldInfo}" - value="%{localUserInfo}" + <sj:textarea name="%{fielUserInfo}" + value="%{user.info}" key="vradi.userPreference.info"/> - <s:set id="saveText"> + <s:set var="saveText"> <s:text name="vradi.save"/> </s:set> <sj:submit id="infoFormSubmit" @@ -87,11 +82,11 @@ <img id="indicator-infoFormSubmit" src="/img/indicator.gif" alt="saving..." style="display:none;"/> </div> - <s:set id="showText"> + <s:set var="showText"> <s:text name="vradi.show"/> </s:set> - <s:set id="deleteText"> + <s:set var="deleteText"> <s:text name="vradi.delete"/> </s:set> @@ -105,12 +100,12 @@ <%--</ws:form>--%> <s:form id="noSendForm" action="edit/%{localUserId}" namespace="/ajax" method="POST"> - <ws:selectAssociation proxy="<%=action.getProxy()%>" + <ws:selectAssociation proxy="${proxy}" name="userId" size="5" - businessEntity="<%=action.getUser()%>" - fqFieldName="<%=VradiUser.FQ_FIELD_VRADIUSER_NOSEND%>" - descField="<%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%>"/> + businessEntity="${user}" + fqFieldName="${fqFieldNoSend}" + descField="${fqFieldUserLogin}"/> <sj:submit id="noSendFormShowSubmit" @@ -143,12 +138,12 @@ <h2><s:text name="vradi.userPreference.noreceived" /></h2> <s:form id="noReceivedForm" action="edit/%{localUserId}" namespace="/ajax" method="POST"> - <ws:selectAssociation proxy="<%=action.getProxy()%>" + <ws:selectAssociation proxy="${proxy}" name="userId" size="5" - businessEntity="<%=action.getUser()%>" - fqFieldName="<%=VradiUser.FQ_FIELD_VRADIUSER_NORECEIVED%>" - descField="<%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%>"/> + businessEntity="${user}" + fqFieldName="${fqFieldNoReceived}" + descField="${fqFieldUserLogin}"/> <sj:submit id="noReceivedFormShowSubmit" @@ -183,8 +178,8 @@ <ws:select name="userId" size="5" - entityValues="<%=action.getPartners()%>" - descField="<%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%>"/> + entityValues="${partners}" + descField="${fqFieldUserLogin}"/> <%--<s:select size="5" name="userId" list="%{localPartners}" listKey="wikittyId" listValue="login"/>--%> <sj:submit @@ -197,7 +192,7 @@ button="true" /> - <s:set id="formText"> + <s:set var="formText"> <s:text name="vradi.userPreference.form"/> </s:set> <sj:submit @@ -224,19 +219,19 @@ <s:url id="resultOpenedUrl" namespace="/ajax" action="formNoteGrid"> <s:param name="opened" value="true"/> </s:url> - <s:set id="creationDateText"> + <s:set var="creationDateText"> <s:text name="vradi.form.creationDate"/> </s:set> - <s:set id="objetText"> + <s:set var="objetText"> <s:text name="vradi.form.object"/> </s:set> - <s:set id="actionText"> + <s:set var="actionText"> <s:text name="vradi.form.action"/> </s:set> - <s:set id="fqCreationDate"> + <s:set var="fqCreationDate"> <%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%> </s:set> - <s:set id="fqObjet"> + <s:set var="fqObjet"> <%=Infogene.FQ_FIELD_INFOGENE_OBJET%> </s:set>