Author: fdesbois Date: 2012-04-02 18:42:25 +0200 (Mon, 02 Apr 2012) New Revision: 3226 Url: http://chorem.org/repositories/revision/pollen/3226 Log: - missing has methods for messages - do not use <s:actionmessage/> and <s:actionerror/> struts tags - problem with some poll flags Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-04-02 09:44:30 UTC (rev 3225) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-04-02 16:42:25 UTC (rev 3226) @@ -71,7 +71,7 @@ @Override public boolean isFinished(Date currentDate) { - return endDate != null && endDate.after(currentDate); + return endDate != null && currentDate.after(endDate); } @Override @@ -81,7 +81,7 @@ @Override public boolean isAddChoiceRunning(Date currentDate) { - return isAddChoiceStarted(currentDate) && !isAddChoiceFinished(currentDate); + return !isClosed() && !isFinished(currentDate) && isAddChoiceStarted(currentDate) && !isAddChoiceFinished(currentDate); } @Override Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-02 09:44:30 UTC (rev 3225) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-02 16:42:25 UTC (rev 3226) @@ -25,6 +25,7 @@ import com.google.common.collect.Lists; import com.opensymphony.xwork2.ActionContext; +import org.apache.commons.collections.CollectionUtils; import org.apache.struts2.StrutsStatics; import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.business.persistence.UserAccount; @@ -78,7 +79,7 @@ return getPollenApplicationContext().getConfiguration(); } - /** Pollen User session. */ + /** Pollen User getPollenSession(). */ private transient PollenSession pollenSession; /** @@ -234,9 +235,9 @@ @Override public void addActionMessage(String message) { - List<String> messages = getPollenSession().getDynamicData(PollenSession.SESSION_TOKEN_MESSAGES); + List<String> messages = getPollenSession().getDynamicData(PollenSession.SESSION_TOKEN_MESSAGES); if (messages == null) { - messages = Lists.newArrayList(message); + messages = Lists.newArrayList(message); getPollenSession().putDynamicData(PollenSession.SESSION_TOKEN_MESSAGES, messages); } else { messages.add(message); @@ -255,24 +256,36 @@ } @Override - public Collection<String> getActionErrors() { - List<String> result = getPollenSession().getDynamicData(PollenSession.SESSION_TOKEN_ERRORS); - if (result != null) { - getPollenSession().removeDynamicData(PollenSession.SESSION_TOKEN_ERRORS); + public Collection<String> getActionMessages() { + List<String> result = getPollenSession().getDynamicData(PollenSession.SESSION_TOKEN_MESSAGES); + if (result == null) { + result = Collections.emptyList(); } else { - result = Collections.emptyList(); + getPollenSession().removeDynamicData(PollenSession.SESSION_TOKEN_MESSAGES); } return result; } @Override - public Collection<String> getActionMessages() { - List<String> result = getPollenSession().getDynamicData(PollenSession.SESSION_TOKEN_MESSAGES); - if (result != null) { - getPollenSession().removeDynamicData(PollenSession.SESSION_TOKEN_MESSAGES); - } else { + public Collection<String> getActionErrors() { + List<String> result = getPollenSession().getDynamicData(PollenSession.SESSION_TOKEN_ERRORS); + if (result == null) { result = Collections.emptyList(); + } else { + getPollenSession().removeDynamicData(PollenSession.SESSION_TOKEN_ERRORS); } return result; } + + @Override + public boolean hasActionMessages() { + List<String> result = getPollenSession().getDynamicData(PollenSession.SESSION_TOKEN_MESSAGES); + return CollectionUtils.isNotEmpty(result); + } + + @Override + public boolean hasActionErrors() { + List<String> result = getPollenSession().getDynamicData(PollenSession.SESSION_TOKEN_ERRORS); + return CollectionUtils.isNotEmpty(result); + } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-02 09:44:30 UTC (rev 3225) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-02 16:42:25 UTC (rev 3226) @@ -245,14 +245,22 @@ <%--<div t:type="nuiton/feedback" t:id="borderFeedback" t:autoClear="false"/>--%> <s:if test="hasActionMessages()"> - <div class="fb-info"> - <s:actionmessage/> + <div class="info_success"> + <ul class="actionMessages"> + <s:iterator value="actionMessages" var="message"> + <li><span><s:property value="#message" escapeHtml="false"/></span></li> + </s:iterator> + </ul> </div> </s:if> <s:if test="hasActionErrors()"> - <div class="fb-error"> - <s:actionerror/> + <div class="info_error"> + <ul class="actionErrors"> + <s:iterator value="actionErrors" var="message"> + <li><span><s:property value="#message" escapeHtml="false"/></span></li> + </s:iterator> + </ul> </div> </s:if> <d:body/> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css 2012-04-02 09:44:30 UTC (rev 3225) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css 2012-04-02 16:42:25 UTC (rev 3226) @@ -111,7 +111,7 @@ .info_success { background: no-repeat scroll 8px 5px #DFFFDF; border: 2px solid #9FCF9F; - width: 800px; + width: 970px; margin-bottom: 5px; } .info_success ul{ @@ -130,7 +130,7 @@ .info_error { background: no-repeat scroll 8px 5px #FFE3E3; border: 2px solid #DD0000; - width: 800px; + width: 970px; margin-bottom: 5px; } .info_error ul{