- Pollen-commits - mailman.cloud.codelutin.com

r3746 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org Nov. 20, 2012

Nov. 20, 2012

Author: tchemit Date: 2012-11-21 00:58:03 +0100 (Wed, 21 Nov 2012) New Revision: 3746 Url: http://chorem.org/repositories/revision/pollen/3746 Log: fixes #851: Empty vote leads to an HTTP 500 Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java 2012-11-20 22:34:18 UTC (rev 3745) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java 2012-11-20 23:58:03 UTC (rev 3746) @@ -120,13 +120,14 @@ return result; } - protected static void fillSimpleVoter(VoterBuilder builder, Vote vote) { builder.newVoter(vote.getPollAccount().getAccountId(), vote.getWeight()); - for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { - builder.addVoteForChoice( - voteToChoice.getChoice().getTopiaId(), - Double.valueOf(voteToChoice.getVoteValue())); + if (!vote.isChoiceVoteToChoiceEmpty()) { + for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { + builder.addVoteForChoice( + voteToChoice.getChoice().getTopiaId(), + Double.valueOf(voteToChoice.getVoteValue())); + } } }

1 0

r3745 - trunk
by tchemit＠users.chorem.org Nov. 20, 2012

Nov. 20, 2012

Author: tchemit Date: 2012-11-20 23:34:18 +0100 (Tue, 20 Nov 2012) New Revision: 3745 Url: http://chorem.org/repositories/revision/pollen/3745 Log: fixes #839: Updates to eugene 2.5.6 fixes #838: Updates to nuiton-utils 2.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 16:05:39 UTC (rev 3744) +++ trunk/pom.xml 2012-11-20 22:34:18 UTC (rev 3745) @@ -149,11 +149,11 @@  <topiaVersion>2.7.1-SNAPSHOT</topiaVersion> - <eugenePluginVersion>2.5.6-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.5.6</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> - <nuitonUtilsVersion>2.6.4-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4.1</struts2Version>

1 0

r3744 - trunk
by tchemit＠users.chorem.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 17:05:39 +0100 (Fri, 16 Nov 2012) New Revision: 3744 Url: http://chorem.org/repositories/revision/pollen/3744 Log: fixes #847: Updates to mavenpom 3.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 20:14:32 UTC (rev 3743) +++ trunk/pom.xml 2012-11-16 16:05:39 UTC (rev 3744) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.4-SNAPSHOT</version> + <version>3.4.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3743 - trunk
by tchemit＠users.chorem.org Nov. 11, 2012

Nov. 11, 2012

Author: tchemit Date: 2012-11-11 21:14:32 +0100 (Sun, 11 Nov 2012) New Revision: 3743 Url: http://chorem.org/repositories/revision/pollen/3743 Log: refs #847: Updates to mavenpom 3.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-09 09:37:09 UTC (rev 3742) +++ trunk/pom.xml 2012-11-11 20:14:32 UTC (rev 3743) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.3</version> + <version>3.4.4-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId>

1 0

r3742 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll css
by kmorin＠users.chorem.org Nov. 9, 2012

Nov. 9, 2012

Author: kmorin Date: 2012-11-09 10:37:09 +0100 (Fri, 09 Nov 2012) New Revision: 3742 Url: http://chorem.org/repositories/revision/pollen/3742 Log: resolves #85 : [Comment] Permettre l'ajout de liens dans les commentaires Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/css/vote.css Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-11-09 09:35:43 UTC (rev 3741) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-11-09 09:37:09 UTC (rev 3742) @@ -23,7 +23,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<div> +<div class="comment"> <s:if test="isDeleteCommentAllowed(#comment)"> <span class="cmd"> <s:a href="#" @@ -35,11 +35,11 @@ </span> </s:if> <span class="name"><s:property value='%{#comment.author}'/></span> : - <span class="date"> - <s:property value='#comment.postDate'/> - </span> + <span class="date"> + <s:property value='#comment.postDate'/> + </span> <p> - <s:property value='#comment.text'/> + <s:property value='#comment.text' escapeHtml="false"/> </p> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-09 09:35:43 UTC (rev 3741) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-09 09:37:09 UTC (rev 3742) @@ -23,6 +23,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="sjr" uri="/struts-jquery-richtext-tags"%> <title><s:property value="%{poll.title}"/></title> @@ -396,9 +397,17 @@ validate="true"> <s:textfield key="commentAuthor" required="true" size="78" label="%{getText('pollen.common.commentAuthor')}"/> - <s:textarea key="commentText" required="true" value='' - label="%{getText('pollen.common.commentText')}"/> - + <sjr:ckeditor + key="commentText" + required="true" + value="" + rows="3" + cols="54" + width="500" + label="%{getText('pollen.common.commentText')}" + toolbar="Basic" + editorLocal="fr" + /> <div class="cleanBoth"> <s:submit action="addComment/%{pollUri}" key="pollen.action.addComment" align="center"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-11-09 09:35:43 UTC (rev 3741) +++ trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-11-09 09:37:09 UTC (rev 3742) @@ -153,6 +153,12 @@ margin: auto; } +#commentZone .comment ul { + list-style-type: disc; + margin: 13px 0; + padding: 0 0 0 40px; +} + #commentZone textarea { width: 500px; height: 100px;

1 0

r3741 - trunk/pollen-ui-struts2/src/main/webapp/css
by kmorin＠users.chorem.org Nov. 9, 2012

Nov. 9, 2012

Author: kmorin Date: 2012-11-09 10:35:43 +0100 (Fri, 09 Nov 2012) New Revision: 3741 Url: http://chorem.org/repositories/revision/pollen/3741 Log: layout Modified: trunk/pollen-ui-struts2/src/main/webapp/css/main.css Modified: trunk/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-11-09 09:33:24 UTC (rev 3740) +++ trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-11-09 09:35:43 UTC (rev 3741) @@ -398,11 +398,6 @@ color: #727a7e; } -#po-header-addressBar { - padding: 5px; - margin-left: 350px; -} - .IndexAddress { background-color: #ffffaa; } @@ -420,6 +415,7 @@ } .content { + margin-top: 5px; padding: 15px; }

1 0

r3740 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by kmorin＠users.chorem.org Nov. 9, 2012

Nov. 9, 2012

Author: kmorin Date: 2012-11-09 10:33:24 +0100 (Fri, 09 Nov 2012) New Revision: 3740 Url: http://chorem.org/repositories/revision/pollen/3740 Log: display descrption + do not display author when author is not defined Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-11-06 20:33:48 UTC (rev 3739) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-11-09 09:33:24 UTC (rev 3740) @@ -83,15 +83,21 @@ <h1 class="titleCreation"><s:property value="poll.title"/></h1> -<h3><s:property value="poll.title"/> <s:text name="pollen.common.by"/> - <s:property value="poll.creator.votingId"/></h3> +<h3> + <s:if test="%{poll.creator.votingId != ''}"> + <s:text name="pollen.common.by"/> + <s:property value="poll.creator.votingId"/> + </s:if> +</h3> +<p> + <s:property value="poll.description" escapeHtml="false"/> +</p> <div class="ui-widget-content ui-corner-all"> - <s:label key="pollen.common.pollId" value=""/> <span class="fright url" id='pollId'> - <s:property value="%{poll.pollId}"/> - </span> + <s:property value="%{poll.pollId}"/> + </span> <br/> </div>

1 0

r3739 - in trunk: . pollen-ui-struts2 pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org Nov. 6, 2012

Nov. 6, 2012

Author: tchemit Date: 2012-11-06 21:33:48 +0100 (Tue, 06 Nov 2012) New Revision: 3739 Url: http://chorem.org/repositories/revision/pollen/3739 Log: refs #846: Use nice text rich editor for description in forms Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-11-06 20:09:20 UTC (rev 3738) +++ trunk/pollen-ui-struts2/pom.xml 2012-11-06 20:33:48 UTC (rev 3739) @@ -181,6 +181,12 @@ </dependency> <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> </dependency> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-06 20:09:20 UTC (rev 3738) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-06 20:33:48 UTC (rev 3739) @@ -23,6 +23,7 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="sjr" uri="/struts-jquery-richtext-tags"%> <link rel="stylesheet" type="text/css" href="<s:url value='/css/pollCreation.css'/>"/> @@ -119,8 +120,12 @@ <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true" size="80"/> - <s:textarea key="poll.description" rows="3" cols="54" - label="%{getText('pollen.common.description')}"/> + + <sjr:ckeditor key="poll.description" rows="10" cols="80" width="800" + label="%{getText('pollen.common.description')}" /> + + <%--s:textarea key="poll.description" rows="3" cols="54" + label="%{getText('pollen.common.description')}"/--%> <s:hidden key="poll.pollId" label=""/> </fieldset> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-06 20:09:20 UTC (rev 3738) +++ trunk/pom.xml 2012-11-06 20:33:48 UTC (rev 3739) @@ -312,6 +312,12 @@ </dependency> <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> <version>${struts2Version}</version>

1 0

r3738 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions
by tchemit＠users.chorem.org Nov. 6, 2012

Nov. 6, 2012

Author: tchemit Date: 2012-11-06 21:09:20 +0100 (Tue, 06 Nov 2012) New Revision: 3738 Url: http://chorem.org/repositories/revision/pollen/3738 Log: fixes #837: Remove date from page header Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-11-06 20:07:54 UTC (rev 3737) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-11-06 20:09:20 UTC (rev 3738) @@ -285,10 +285,6 @@ return language; } - public static Date getCurrentDateTime() { - return new Date(); - } - public String getCurrentUrl() { String result = request.getRequestURL().toString(); return result;

1 0

r3737 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators
by tchemit＠users.chorem.org Nov. 6, 2012

Nov. 6, 2012

Author: tchemit Date: 2012-11-06 21:07:54 +0100 (Tue, 06 Nov 2012) New Revision: 3737 Url: http://chorem.org/repositories/revision/pollen/3737 Log: fixes #837: Remove date from page header Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-11-06 20:05:29 UTC (rev 3736) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-11-06 20:07:54 UTC (rev 3737) @@ -95,21 +95,24 @@ <body id="<s:property value="%{pageLogo}"/>Body">  -<div id="po-header-localization" class="<s:property value='%{pageLogo}'/>Localization"> +<div id="po-header-localization" + class="<s:property value='%{pageLogo}'/>Localization"> <s:a title="Contacter un administrateur" href="mailto:%{configuration.adminEmail}"> <img src="<s:url value='/img/contact.png' />" alt="Contact"/> </s:a> - | <%=PollenActionSupport.getCurrentDateTime()%> | + | <s:a action="changeLang" namespace="/user" id="localeFr"> <s:param name="request_locale">fr_FR</s:param> <s:param name="redirectUrl" value="%{currentUrl}"/> <img src="<s:url value='/img/fr.png' />" alt="Français"/> - </s:a> | <s:a action="changeLang" namespace="/user" id="localeEn"> - <s:param name="request_locale">en_GB</s:param> - <s:param name="redirectUrl" value="%{currentUrl}"/> - <img src="<s:url value='/img/en.png' />" alt="English"/> -</s:a> + </s:a> + | + <s:a action="changeLang" namespace="/user" id="localeEn"> + <s:param name="request_locale">en_GB</s:param> + <s:param name="redirectUrl" value="%{currentUrl}"/> + <img src="<s:url value='/img/en.png' />" alt="English"/> + </s:a> </div>

1 0