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

r3781 - in trunk: . pollen-ui-struts2
by tchemit＠users.chorem.org April 29, 2013

April 29, 2013

Author: tchemit Date: 2013-04-29 10:59:51 +0200 (Mon, 29 Apr 2013) New Revision: 3781 Url: http://chorem.org/projects/pollen/repository/revisions/3781 Log: fixes #906: Updates postgresql to 9.2-1002-jdbc4 Modified: trunk/pollen-ui-struts2/pom.xml trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-28 20:27:51 UTC (rev 3780) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-29 08:59:51 UTC (rev 3781) @@ -204,7 +204,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 20:27:51 UTC (rev 3780) +++ trunk/pom.xml 2013-04-29 08:59:51 UTC (rev 3781) @@ -155,7 +155,7 @@ <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> - <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <postgresqlVersion>9.2-1002-jdbc4</postgresqlVersion> <struts2Version>2.3.12</struts2Version> <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> @@ -203,7 +203,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <version>${postgresqlVersion}</version> </dependency>

1 0

r3780 - trunk
by tchemit＠users.chorem.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 22:27:51 +0200 (Sun, 28 Apr 2013) New Revision: 3780 Url: http://chorem.org/projects/pollen/repository/revisions/3780 Log: fixes #905: Updates topia to 2.8-rc-1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 19:54:45 UTC (rev 3779) +++ trunk/pom.xml 2013-04-28 20:27:51 UTC (rev 3780) @@ -148,7 +148,7 @@ <projectId>pollen</projectId>  - <topiaVersion>2.8-rc-1-SNAPSHOT</topiaVersion> + <topiaVersion>2.8-rc-1</topiaVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r3779 - trunk
by tchemit＠users.chorem.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 21:54:45 +0200 (Sun, 28 Apr 2013) New Revision: 3779 Url: http://chorem.org/projects/pollen/repository/revisions/3779 Log: updates Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 19:49:07 UTC (rev 3778) +++ trunk/pom.xml 2013-04-28 19:54:45 UTC (rev 3779) @@ -159,9 +159,9 @@ <struts2Version>2.3.12</struts2Version> <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> - <slf4jVersion>1.7.3</slf4jVersion> + <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> - <hibernateVersion>4.2.0.Final</hibernateVersion> + <hibernateVersion>4.2.1.Final</hibernateVersion> <seleniumVersion>2.28.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion>

1 0

r3778 - trunk
by tchemit＠users.chorem.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 21:49:07 +0200 (Sun, 28 Apr 2013) New Revision: 3778 Url: http://chorem.org/projects/pollen/repository/revisions/3778 Log: fixes #900: updates nuiton-utils to 2.6.12 fixes #904: Updates mavenpom to 3.4.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 19:08:18 UTC (rev 3777) +++ trunk/pom.xml 2013-04-28 19:49:07 UTC (rev 3778) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.7</version> + <version>3.4.10</version> </parent> <groupId>org.chorem</groupId> @@ -153,7 +153,7 @@ <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> - <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.12</struts2Version> @@ -173,6 +173,10 @@ <locales>en,fr</locales> <scmwebeditorEnabled>true</scmwebeditorEnabled> +  +  </properties> <dependencyManagement>

1 0

r3777 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/decorators WEB-INF/jsp/poll js
by tchemit＠users.chorem.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 21:08:18 +0200 (Sun, 28 Apr 2013) New Revision: 3777 Url: http://chorem.org/projects/pollen/repository/revisions/3777 Log: refs #894: Can not create or edit a poll while using IE9 Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js 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 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-28 19:08:18 UTC (rev 3777) @@ -70,8 +70,6 @@ $(document).one('mousemove', function() { function KMe(node, attrName, pattern) { var attr = node.attr(attrName).replace( pattern + '\/', ''); - //console.info("Unlock " + pattern + " " + node.attr('id') + - // " - " + attrName + " = " + attr); node.attr(attrName, attr); node.removeClass(pattern); } 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 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2013-04-28 19:08:18 UTC (rev 3777) @@ -74,7 +74,6 @@ function displayVoteCountingHelp(type) { var help= $(document).data('voteCountingTypeHelp'); - console.info("Change vct to "+type+" : "+help[type]); $('#voteCountingHelp').html(help[type]); } $('[name="poll.voteCountingType"]').change(function () { @@ -385,7 +384,6 @@ var item = $(ui.item); var container = item.data('choiceType'); var choiceNumber = item.data('choiceNumber'); - //console.info('Moved ' + container + ' -- ' + choiceNumber); reorder(container); } }); Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2013-04-28 19:08:18 UTC (rev 3777) @@ -386,35 +386,6 @@ function updateUpdownActions(containerId) { reorder(containerId); - /*var firstChoice = getFirstChoice(containerId); - var lastChoice = getLastChoice(containerId); - - getAllChoices(containerId).each(function (index) { - - var currentChoiceNumber = $(this).data('choiceNumber'); - - var labelWidget = $('#' + containerId + "_label_" + currentChoiceNumber); - labelWidget.html(datas['choiceText'] + ' ' + (index + 1)); - - var upWidget = $('#' + containerId + "_up_" + currentChoiceNumber); - if (firstChoice == currentChoiceNumber) { - // hide up - upWidget.addClass('hidden'); - } else { - //show up - upWidget.removeClass('hidden'); - } - - var downWidget = $('#' + containerId + "_down_" + currentChoiceNumber); - if (lastChoice == currentChoiceNumber) { - // hide down - downWidget.addClass('hidden'); - } else { - //show down - downWidget.removeClass('hidden'); - } - });*/ - } function loadChoice(containerId, choicePrefix, url, choiceNumber, nbChoices, tokenId) { @@ -504,78 +475,6 @@ return false; } -/*function upChoice(choiceId) { - var choice = $('#' + choiceId); - var choicePrefix = choice.data('choicePrefix'); - var choiceNumber = choice.data('choiceNumber'); - var newChoiceNumber = (choiceNumber - 1); - - return switchChoices(choicePrefix, choiceNumber, newChoiceNumber); -} - -function downChoice(choiceId) { - var choice = $('#' + choiceId); - var choicePrefix = choice.data('choicePrefix'); - var choiceNumber = choice.data('choiceNumber'); - var newChoiceNumber = (choiceNumber + 1); - - return switchChoices(choicePrefix, choiceNumber, newChoiceNumber); -}*/ - -/*function switchChoices(choicePrefix, choiceNumber, newChoiceNumber) { - - // change topiaId - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.topiaId'); - // change description - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.description'); - - // change name - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.name'); - - if ('imageChoice_' == choicePrefix) { - - // change location - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.location'); - - // change thumb - switchThumb(choicePrefix, choiceNumber, newChoiceNumber); - } - return false; -} - -function switchValue(choicePrefix, choiceNumber, newChoiceNumber, suffix) { - var choiceTI = $('[name="' + choicePrefix + choiceNumber + suffix + '"]'); - var choiceTIVal = choiceTI.val(); - var newChoiceTI = $('[name="' + choicePrefix + newChoiceNumber + suffix + '"]'); - var newChoiceTIVal = newChoiceTI.val(); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.val(newChoiceTIVal); - newChoiceTI.val(choiceTIVal); -} - -function switchThumb(choicePrefix, choiceNumber, newChoiceNumber) { - var choiceTI = $('[name="' + choicePrefix + choiceNumber + '.thumb"]'); - var newChoiceTI = $('[name="' + choicePrefix + newChoiceNumber + '.thumb"]'); - - var choiceTIVal = choiceTI.attr("alt"); - var newChoiceTIVal = newChoiceTI.attr("alt"); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.attr("alt", newChoiceTIVal); - newChoiceTI.attr("alt", choiceTIVal); - - choiceTIVal = choiceTI.attr("title"); - newChoiceTIVal = newChoiceTI.attr("title"); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.attr("title", newChoiceTIVal); - newChoiceTI.attr("title", choiceTIVal); - - choiceTIVal = choiceTI.attr("src"); - newChoiceTIVal = newChoiceTI.attr("src"); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.attr("src", newChoiceTIVal); - newChoiceTI.attr("src", choiceTIVal); -}*/ - function confirmClose() { $('.ui-dialog-title').html(datas['confirmCloseTitle']); var dialog = $("#confirmDialog"); Modified: trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2013-04-28 19:08:18 UTC (rev 3777) @@ -88,13 +88,6 @@ return result; }, -// addAddRowTopic:function (gridId, url) { -// $.subscribe(gridId + '-rowAdd', function (event) { -// var url = event.data.url; -// window.location = url; -// }, {id:gridId, url:url}); -// }, - addSingleRowTopic:function (gridId, action, url, parameterName) { $.subscribe(gridId + '-row' + action, function (event) { var gridId = event.data.id; Modified: trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js 2013-04-28 19:08:18 UTC (rev 3777) @@ -194,8 +194,8 @@ objImagePreloader.onload=function(){}; }; objImagePreloader.src = settings.imageArray[settings.activeImage][0]; - }; - /** + } + /** * Perfomance an effect in the image container resizing it * * @param integer intImageWidth The image�s width that will be showed @@ -222,8 +222,8 @@ } $('#lightbox-container-image-data-box').css({ width: intImageWidth }); $('#lightbox-nav-btnPrev,#lightbox-nav-btnNext').css({ height: intImageHeight + (settings.containerBorderSize * 2) }); - }; - /** + } + /** * Show the prepared image * */ @@ -234,8 +234,8 @@ _set_navigation(); }); _preload_neighbor_images(); - }; - /** + } + /** * Show the image information * */ @@ -436,8 +436,8 @@ } arrayPageSize = new Array(pageWidth,pageHeight,windowWidth,windowHeight); return arrayPageSize; - }; - /** + } + /** / THIRD FUNCTION * getPageScroll() by quirksmode.com * @@ -457,8 +457,8 @@ } arrayPageScroll = new Array(xScroll,yScroll); return arrayPageScroll; - }; - /** + } + /** * Stop the code execution from a escified time in milisecond * */ @@ -467,8 +467,8 @@ curDate = null; do { var curDate = new Date(); } while ( curDate - date < ms); - }; - // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once + } + // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once return this.unbind('click').click(_initialize); }; })(jQuery); // Call and execute the function immediately passing the jQuery object \ No newline at end of file

1 0

r3776 - trunk
by tchemit＠users.chorem.org April 23, 2013

April 23, 2013

Author: tchemit Date: 2013-04-23 23:33:56 +0200 (Tue, 23 Apr 2013) New Revision: 3776 Url: http://chorem.org/projects/pollen/repository/revisions/3776 Log: update to next topia version (2.8-rc-1) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-22 20:49:16 UTC (rev 3775) +++ trunk/pom.xml 2013-04-23 21:33:56 UTC (rev 3776) @@ -148,7 +148,7 @@ <projectId>pollen</projectId>  - <topiaVersion>2.8-SNAPSHOT</topiaVersion> + <topiaVersion>2.8-rc-1-SNAPSHOT</topiaVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r3775 - in trunk/pollen-ui-struts2/src/main/webapp/WEB-INF: decorators jsp/admin jsp/poll jsp/user
by tchemit＠users.chorem.org April 22, 2013

April 22, 2013

Author: tchemit Date: 2013-04-22 22:49:16 +0200 (Mon, 22 Apr 2013) New Revision: 3775 Url: http://chorem.org/projects/pollen/repository/revisions/3775 Log: replace required attribute by requiredLabel attribute Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.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 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -168,14 +168,14 @@ <label for="connection_login"> <s:text name="pollen.common.login"/> : </label> - <s:textfield key="login" size="10" required="true" theme="simple" + <s:textfield key="login" size="10" requiredLabel="true" theme="simple" label='' id='connection_login'/> </li> <li> <label for="connection_password"> <s:text name="pollen.common.password"/> : </label> - <s:password key="password" size="10" required="true" + <s:password key="password" size="10" requiredLabel="true" id='connection_password' label="" theme="simple"/> </li> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -89,10 +89,10 @@ <fieldset> <legend><s:text name="pollen.fieldset.userInformation.toCreate"/></legend> <s:textfield key="createUser.login" - label="%{getText('pollen.common.login')}" required="true" + label="%{getText('pollen.common.login')}" requiredLabel="true" size="40"/> <s:textfield key="createUser.email" - label="%{getText('pollen.common.email')}" required="true" + label="%{getText('pollen.common.email')}" requiredLabel="true" size="40"/> <s:textfield key="createUser.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> @@ -114,9 +114,9 @@ <fieldset> <legend><s:text name="pollen.fieldset.userInformation.toUpdate"/></legend> <s:textfield key="editUser.login" label="%{getText('pollen.common.login')}" - required="true" readonly="true" size="40"/> + requiredLabel="true" readonly="true" size="40"/> <s:textfield key="editUser.email" label="%{getText('pollen.common.email')}" - required="true" size="40" disabled="true"/> + requiredLabel="true" size="40" disabled="true"/> <s:textfield key="editUser.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> <s:textfield key="editUser.lastName" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -36,7 +36,7 @@ <s:textarea key='comment.text' readonly="true" rows="3" label="%{getText('pollen.common.commentText')}"/> - <s:textarea key='reason' rows="3" required="true" + <s:textarea key='reason' rows="3" requiredLabel="true" label="%{getText('pollen.common.deleteReason')}"/> <hr/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -33,7 +33,7 @@ </s:param> </s:text>. - <s:textarea key='reason' rows="3" required="true" + <s:textarea key='reason' rows="3" requiredLabel="true" label="%{getText('pollen.common.deleteReason')}"/> <hr/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -22,6 +22,6 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:textfield required="true" size="3" theme="simple" +<s:textfield requiredLabel="true" size="3" theme="simple" name="vote.choiceVoteToChoice[%{#status.index}].voteValue" value="%{vote.choiceVoteToChoice[#status.index].voteValue}"/> 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 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -119,7 +119,7 @@ <fieldset> <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" - required="true" size="80"/> + requiredLabel="true" size="80"/> <s:url var="configUrl" value='/js/ckeditor.config.js'/> 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 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -248,7 +248,7 @@ </s:if> <s:else> <th id="voterName"> - <s:textfield key='pollAccount.votingId' required="true" label='' + <s:textfield key='pollAccount.votingId' requiredLabel="true" label='' value="%{pollAccount.votingId}" theme="simple"/> </th> </s:else> @@ -355,17 +355,17 @@ enctype="multipart/form-data"> <h4><s:text name="pollen.action.addChoice"/></h4> <s:if test="textType"> - <s:textfield key="choice.name" required="true" + <s:textfield key="choice.name" requiredLabel="true" label="%{getText('pollen.common.choice')}" /> </s:if> <s:elseif test="dateType"> - <sj:datepicker key="choice.date" required="true" + <sj:datepicker key="choice.date" requiredLabel="true" label="%{getText('pollen.common.choice')}" changeMonth="true" changeYear="true" timepicker="true" displayFormat="%{getText('pollen.common.datePickerPattern')}" /> </s:elseif> <s:elseif test="imageType"> - <s:file key="imageChoice[0]" required="true" cssClass="nameField" + <s:file key="imageChoice[0]" requiredLabel="true" cssClass="nameField" label="%{getText('pollen.common.choice')}" /> </s:elseif> <br/> @@ -395,11 +395,11 @@ <s:form id='addCommentForm' method="POST" namespace="/poll" validate="true"> - <s:textfield key="commentAuthor" required="true" size="78" + <s:textfield key="commentAuthor" requiredLabel="true" size="78" label="%{getText('pollen.common.commentAuthor')}"/> <s:url var="configUrl" value='/js/ckeditor.config.js'/> - <sjr:ckeditor key="commentText" required="true" + <sjr:ckeditor key="commentText" requiredLabel="true" value="" rows="3" cols="54" width="500" label="%{getText('pollen.common.commentText')}" toolbar="PollenToolbar" customConfig="%{configUrl}" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -92,7 +92,7 @@ <s:form namespace="/user" method="POST"> <s:textfield key="pollId" label='%{getText("pollen.common.pollId")}' - required="true" size="80" tooltipIconPath="/img/tooltip.png" + requiredLabel="true" size="80" tooltipIconPath="/img/tooltip.png" tooltip='%{getText("poll.help.pollId")}'/> <br/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -32,7 +32,7 @@ <s:text name="pollen.information.lostPassword"/> <div style="padding: 1em; margin-bottom: 3em;"> - <s:textfield key="email" required="true" size="30"/> + <s:textfield key="email" requiredLabel="true" size="30"/> </div> <hr/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -36,9 +36,9 @@ <s:hidden key="pollenUserAccount.topiaId" label=""/> <s:textfield name="pollenUserAccount.login" key="pollen.common.login" - required="true"/> + requiredLabel="true"/> <s:password name="pollenUserAccount.password" key="pollen.common.password" - required="true"/> + requiredLabel="true"/> <s:password name="newPassword" key="pollen.common.newPassword"/> <s:password name="newPassword2" key="pollen.common.newPassword2"/> </fieldset> @@ -47,7 +47,7 @@ <legend><s:text name="pollen.fieldset.userInformation"/></legend> <s:textfield name="pollenUserAccount.email" key="pollen.common.email" - required="true" disabled="%{exists}"/> + requiredLabel="true" disabled="%{exists}"/> <s:textfield name="pollenUserAccount.firstName" key="pollen.common.firstName"/> <s:textfield name="pollenUserAccount.lastName" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -102,9 +102,9 @@ <legend> <s:text name="pollen.fieldset.pollAccount.toAddToFavoriteList"/> </legend> - <s:textfield key="createPollAccount.votingId" required="true" + <s:textfield key="createPollAccount.votingId" requiredLabel="true" label="%{getText('pollen.common.name')}" size="40"/> - <s:textfield key="createPollAccount.email" required="true" + <s:textfield key="createPollAccount.email" requiredLabel="true" label="%{getText('pollen.common.email')}" size="40"/> </fieldset> @@ -124,9 +124,9 @@ <legend> <s:text name="pollen.fieldset.pollAccount.toEditToFavoriteList"/> </legend> - <s:textfield key="editPollAccount.votingId" required="true" + <s:textfield key="editPollAccount.votingId" requiredLabel="true" label="%{getText('pollen.common.name')}" size="40"/> - <s:textfield key="editPollAccount.email" required="true" + <s:textfield key="editPollAccount.email" requiredLabel="true" label="%{getText('pollen.common.email')}" size="40"/> </fieldset> <br/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -97,7 +97,7 @@ <legend> <s:text name="pollen.fieldset.userFavoriteList.toCreate"/> </legend> - <s:textfield key="createFavoriteList.name" required="true" size="40" + <s:textfield key="createFavoriteList.name" requiredLabel="true" size="40" label="%{getText('pollen.common.name')}"/> <s:file id='csvImport' key="csvImport[0]" label="%{getText('pollen.common.csvImport')}" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -38,10 +38,10 @@ <legend><s:text name="pollen.fieldset.login"/></legend> <s:textfield key="login" size="10" label="%{getText('pollen.common.login')}" - required="true"/> + requiredLabel="true"/> <s:password key="password" label="%{getText('pollen.common.password')}" size="10" - required="true"/> + requiredLabel="true"/> </fieldset> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -36,17 +36,17 @@ <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> <s:textfield name="pollenUserAccount.login" key="pollen.common.login" - required="true"/> + requiredLabel="true"/> <s:password name="pollenUserAccount.password" key="pollen.common.password" - required="true"/> - <s:password name="password2" key="pollen.common.password2" required="true"/> + requiredLabel="true"/> + <s:password name="password2" key="pollen.common.password2" requiredLabel="true"/> </fieldset> <fieldset> <legend><s:text name="pollen.fieldset.userInformation"/></legend> <s:textfield name="pollenUserAccount.email" key="pollen.common.email" - required="true"/> + requiredLabel="true"/> <s:textfield name="pollenUserAccount.firstName" key="pollen.common.firstName"/> <s:textfield name="pollenUserAccount.lastName"

1 0

r3774 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by tchemit＠users.chorem.org April 22, 2013

April 22, 2013

Author: tchemit Date: 2013-04-22 22:34:22 +0200 (Mon, 22 Apr 2013) New Revision: 3774 Url: http://chorem.org/projects/pollen/repository/revisions/3774 Log: up to 1.5.2-SNAPSHOT version Modified: trunk/ trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea atlassian-ide-plugin.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-persistence/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-services/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-api/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-borda/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-normal/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-number/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module>

1 0

r3773 - trunk
by tchemit＠users.chorem.org April 22, 2013

April 22, 2013

Author: tchemit Date: 2013-04-22 22:32:27 +0200 (Mon, 22 Apr 2013) New Revision: 3773 Url: http://chorem.org/projects/pollen/repository/revisions/3773 Log: fixes #895: updates struts2 to 2.3.12 fixes #896: updates struts-jquery to 3.5.1 fixes #897: updates eugene to 2.6.1 fixes #898: updates h2 to 1.3.171 fixes #899: updates slf4j to 1.7.3 fixes #900: updates nuiton-utils to 2.6.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-22 20:21:27 UTC (rev 3772) +++ trunk/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) @@ -149,17 +149,17 @@  <topiaVersion>2.8-SNAPSHOT</topiaVersion> - <eugenePluginVersion>2.6</eugenePluginVersion> + <eugenePluginVersion>2.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> - <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> - <h2Version>1.3.170</h2Version> + <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> + <h2Version>1.3.171</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.7</struts2Version> - <jqueryPluginVersion>3.5.0</jqueryPluginVersion> + <struts2Version>2.3.12</struts2Version> + <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> - <slf4jVersion>1.7.2</slf4jVersion> + <slf4jVersion>1.7.3</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>4.2.0.Final</hibernateVersion> <seleniumVersion>2.28.0</seleniumVersion>

1 0

r3772 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org April 22, 2013

April 22, 2013

Author: tchemit Date: 2013-04-22 22:21:27 +0200 (Mon, 22 Apr 2013) New Revision: 3772 Url: http://chorem.org/projects/pollen/repository/revisions/3772 Log: fixes #858: Cannot see result after close manually Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2013-04-22 19:54:47 UTC (rev 3771) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2013-04-22 20:21:27 UTC (rev 3772) @@ -138,7 +138,12 @@ if (!publicResults) { // poll results are private, only poll admin can see results - return n_("pollen.security.error.poll.result.private.and.access.not.granted"); + + if (!securityContext.isCreator() && !securityContext.isAdmin()) { + + // not a poll admin, can not access result + return n_("pollen.security.error.poll.result.private.and.access.not.granted"); + } } return null;

1 0