Author: tchemit Date: 2012-03-14 17:59:04 +0100 (Wed, 14 Mar 2012) New Revision: 3190 Url: http://chorem.org/repositories/revision/pollen/3190 Log: generate and propage accountId at poll creation Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personToList.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-03-14 16:58:23 UTC (rev 3189) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-03-14 16:59:04 UTC (rev 3190) @@ -997,6 +997,9 @@ String email = getNonEmptyParameterValue(prefix + ".email"); account.setEmail(email); + String accountId = getNonEmptyParameterValue(prefix + ".accountId"); + account.setAccountId(accountId); + result.put(personToListNumber, personToList); } return personToListNumber; Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-03-14 16:58:23 UTC (rev 3189) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-03-14 16:59:04 UTC (rev 3190) @@ -30,6 +30,7 @@ import org.chorem.pollen.business.persistence.PersonToList; import org.chorem.pollen.business.persistence.PersonToListImpl; import org.chorem.pollen.business.persistence.PollAccountImpl; +import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.util.Map; @@ -131,10 +132,7 @@ } if (personToList == null) { - personToList = new PersonToListImpl(); - personToList.setWeight(1); - PollAccountImpl pollAccount = new PollAccountImpl(); - personToList.setPollAccount(pollAccount); + personToList = newService(PollService.class).getNewPersonToList(null); } // consume personToList errors Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-03-14 16:58:23 UTC (rev 3189) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-03-14 16:59:04 UTC (rev 3190) @@ -26,9 +26,9 @@ import com.google.common.collect.Maps; import org.chorem.pollen.business.persistence.PersonList; import org.chorem.pollen.business.persistence.PersonToList; -import org.chorem.pollen.business.persistence.PersonToListImpl; import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.services.impl.FavoriteService; +import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.ui.PollenSession; import org.chorem.pollen.ui.actions.PollenActionSupport; @@ -100,11 +100,13 @@ service.getFavoriteList(session.getUserAccount(), personListId); nbPersonToLists = favoriteList.sizePollAccount(); if (nbPersonToLists > 0) { + + PollService pollService = newService(PollService.class); + int index = personToListNumber; for (PollAccount pollAccount : favoriteList.getPollAccount()) { - PersonToList p = new PersonToListImpl(); - p.setPollAccount(pollAccount); - p.setWeight(1); + + PersonToList p = pollService.getNewPersonToList(pollAccount); data.put(index++, p); } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personToList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personToList.jsp 2012-03-14 16:58:23 UTC (rev 3189) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personToList.jsp 2012-03-14 16:59:04 UTC (rev 3190) @@ -33,6 +33,7 @@ <s:div id='%{#prefix}'> <s:fielderror/> <s:hidden key='%{#prefix}.topiaId' value='%{personToList.topiaId}' label=''/> + <s:hidden key='%{#prefix}.accountId' value='%{personToList.pollAccount.accountId}' label=''/> <div class="fleft choiceName"> <s:label for="%{#prefix}.votingId" id="%{#prefix}_label" theme="simple" value=''/>