Author: fdesbois Date: 2012-04-13 10:16:54 +0200 (Fri, 13 Apr 2012) New Revision: 3254 Url: http://chorem.org/repositories/revision/pollen/3254 Log: use nuiton-struts2 1.11 to use fielderror tag Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp branches/pollen-1.2.6-struts2/pom.xml Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-12 16:27:37 UTC (rev 3253) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-13 08:16:54 UTC (rev 3254) @@ -474,7 +474,7 @@ if (StringUtils.isEmpty(votingListName)) { addOptionsError( - fieldNamePrefix + ".name", + fieldNamePrefix, _("pollen.error.poll.required.votingList.name")); } else { @@ -484,7 +484,7 @@ // name doublon addOptionsError( - fieldNamePrefix + ".name", + fieldNamePrefix, _("pollen.error.poll.votingList.name.doublon")); } @@ -497,7 +497,7 @@ // no weight filled (can be a bad conversion) addOptionsError( - fieldNamePrefix + ".weight", + fieldNamePrefix, _("pollen.error.poll.votingList.weight.not.valid")); } } @@ -548,7 +548,7 @@ // voter doublon addOptionsError( - fieldNamePrefix + ".votingId", + fieldNamePrefix, _("pollen.error.poll.personToList.votingId.doublon")); } } @@ -557,7 +557,7 @@ if (StringUtils.isEmpty(email)) { addOptionsError( - fieldNamePrefix + ".email", + fieldNamePrefix, _("pollen.error.poll.personToList.email.required")); } else { @@ -567,7 +567,7 @@ // not a valid email addOptionsError( - fieldNamePrefix + ".email", + fieldNamePrefix, _("pollen.error.poll.personToList.email.not.valid")); } else { @@ -577,7 +577,7 @@ // email doublon addOptionsError( - fieldNamePrefix + ".email", + fieldNamePrefix, _("pollen.error.poll.personToList.email.doublon")); } } @@ -588,7 +588,7 @@ // no weight filled (can be a bad conversion) addOptionsError( - fieldNamePrefix + ".weight", + fieldNamePrefix, _("pollen.error.poll.personToList.weight.not.valid")); } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-04-12 16:27:37 UTC (rev 3253) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-04-13 08:16:54 UTC (rev 3254) @@ -23,6 +23,7 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sp" uri="/nuiton-tags" %> <s:set name="personPrefix">votingList<s:property value="votingListType"/>_<s:property value="votingListNumber"/>PersonToList_<s:property value="personToListNumber"/> </s:set> @@ -34,6 +35,7 @@ <s:div id='%{#personPrefix}' cssClass="personToList"> <s:hidden key='%{#personPrefix}.topiaId' value='%{#personToList.topiaId}' label=''/> <s:hidden key='%{#personPrefix}.accountId' value='%{#personToList.pollAccount.accountId}' label=''/> + <sp:fielderror fieldName="%{#personPrefix}"/> <div class="fleft choiceName"> <s:label for="%{#personPrefix}.votingId" id="%{#personPrefix}_label" theme="simple" value=''/> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-04-12 16:27:37 UTC (rev 3253) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-04-13 08:16:54 UTC (rev 3254) @@ -23,6 +23,7 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sp" uri="/nuiton-tags" %> <s:set name="prefix">votingList<s:property value="votingListType"/>_<s:property value="votingListNumber"/></s:set> @@ -36,7 +37,7 @@ <s:div id='%{#prefix}' cssClass="votingList"> <fieldset class="ui-widget-content ui-corner-all"> - <s:fielderror fieldName="%{#prefix}"/> + <sp:fielderror fieldName="%{#prefix}"/> <s:if test='%{#votingListType == "GROUP"}'> <%--<div>--%> <div class="fleft choiceName"> Modified: branches/pollen-1.2.6-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pom.xml 2012-04-12 16:27:37 UTC (rev 3253) +++ branches/pollen-1.2.6-struts2/pom.xml 2012-04-13 08:16:54 UTC (rev 3254) @@ -451,7 +451,7 @@ <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <tapestryVersion>5.1.0.5</tapestryVersion> - <nuitonWebVersion>1.10</nuitonWebVersion> + <nuitonWebVersion>1.11</nuitonWebVersion> <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> <h2Version>1.3.165</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>