Author: kmorin Date: 2014-12-17 16:29:42 +0000 (Wed, 17 Dec 2014) New Revision: 731 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/731 Log: fixes #6299 L'historique n'appara?\195?\174t pas dans l'ordre dans la consultation via lien URL Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/DemandDetailAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/DemandDetailAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/DemandDetailAction.java 2014-12-16 15:25:54 UTC (rev 730) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/DemandDetailAction.java 2014-12-17 16:29:42 UTC (rev 731) @@ -32,6 +32,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailGroup; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.Reply; @@ -42,8 +43,10 @@ import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.google.common.base.Function; +import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; +import com.google.common.collect.Ordering; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -82,6 +85,8 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Map; @@ -241,6 +246,7 @@ } public List<EmailUIModel> getReplies() throws Exception { + Preconditions.checkNotNull(demand); List<EmailUIModel> result = new ArrayList<>(); for (Reply reply : demand.getReplies()) { @@ -278,6 +284,20 @@ return result; } + public List<History> getHistories() { + Preconditions.checkNotNull(demand); + List<History> result = new ArrayList<>(demand.getHistory()); + + Collections.sort(result, Ordering.natural().onResultOf(new Function<History, Comparable>() { + @Override + public Comparable apply(History history) { + return history.getModificationDate(); + } + })); + + return result; + } + public String decorate(Object o) { return decorate(o, " "); } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp 2014-12-16 15:25:54 UTC (rev 730) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp 2014-12-17 16:29:42 UTC (rev 731) @@ -80,7 +80,7 @@ </a> <s:if test="demand.sizeHistory() > 0"> <ul class="dropdown-menu" role="menu"> - <s:iterator value="demand.history" var="history"> + <s:iterator value="histories" var="history"> <li><span> <div> le <s:text name="%{decorate(#history.modificationDate)}"/>