Author: tchemit Date: 2012-06-18 13:38:22 +0200 (Mon, 18 Jun 2012) New Revision: 3513 Url: http://chorem.org/repositories/revision/pollen/3513 Log: - remove the suffixUrl stuff - can now change image choice - i18n Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java 2012-06-18 10:42:01 UTC (rev 3512) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java 2012-06-18 11:38:22 UTC (rev 3513) @@ -22,8 +22,6 @@ */ package org.chorem.pollen.bean; -import org.apache.commons.lang3.StringUtils; - /** * Created: 12/04/12 * @@ -33,8 +31,6 @@ private String baseUrl; - private String suffixUrl; - private PollUri pollUri; /** @@ -65,7 +61,6 @@ result.baseUrl = pollUrl.getBaseUrl(); String pollId = pollUrl.getPollUri().getPollId(); result.pollUri = PollUri.newPollUri(pollId, accountId); - result.suffixUrl = pollUrl.suffixUrl; return result; } @@ -80,19 +75,8 @@ return pollUri; } - public String getSuffixUrl() { - return suffixUrl; - } - - public void setSuffixUrl(String suffixUrl) { - this.suffixUrl = suffixUrl; - } - public String getUrl() { String result = getBaseUrl() + getPollUri().getUri(); - if (StringUtils.isNotBlank(suffixUrl)) { - result += suffixUrl; - } return result; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-18 10:42:01 UTC (rev 3512) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-18 11:38:22 UTC (rev 3513) @@ -28,6 +28,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; @@ -73,7 +74,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.UUID; import static org.nuiton.i18n.I18n.l_; @@ -793,7 +793,10 @@ ChoiceType choiceType = poll.getChoiceType(); ChoiceDAO dao = getDAO(Choice.class); Choice choiceLoaded; - if (choice.getTopiaId() == null) { + + boolean newChoice = choice.getTopiaId() == null; + + if (newChoice) { choiceLoaded = create(dao); poll.addChoice(choiceLoaded); @@ -803,18 +806,20 @@ if (choiceType == ChoiceType.IMAGE) { - PollImageChoice imageChoice = (PollImageChoice) choice; - imageChoice.toChoice(choiceLoaded); - if (choice.getTopiaId() == null) { + if (newChoice || + !ObjectUtils.equals(choice.getName(), + choiceLoaded.getName())) { // copy image where it belong and generate the thumb - // only if choice is to create + // only if choice is to create or name has change (so image too...) try { saveImages(poll, imageChoice); } catch (IOException e) { throw new PollenTechnicalException( "Could not create image choice", e); } + // bind other fields + imageChoice.toChoice(choiceLoaded); } } else if (choiceType == ChoiceType.DATE) { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-18 10:42:01 UTC (rev 3512) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-18 11:38:22 UTC (rev 3513) @@ -45,7 +45,6 @@ public PollUrl getPollCloneUrl(Poll poll) { PollUrl result = newPollUrl(PollActions.CLONE, poll, true); - result.setSuffixUrl("!input"); return result; } @@ -71,7 +70,6 @@ public PollUrl getPollEditUrl(Poll poll) { PollUrl result = newPollUrl(PollActions.EDIT, poll, true); - result.setSuffixUrl("!input"); return result; } Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-18 10:42:01 UTC (rev 3512) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-18 11:38:22 UTC (rev 3513) @@ -327,13 +327,13 @@ pollen.tab.poll.options=Options pollen.title.clone.poll=Clone a poll pollen.title.close.poll=Close a poll -pollen.title.editPoll=Edit a poll pollen.title.createPoll=New poll pollen.title.delete.poll=Delete a poll pollen.title.delete.pollChoice=Delete a poll choice pollen.title.delete.pollComment=Delete a poll comment pollen.title.delete.pollVote=Delete a poll vote pollen.title.editFavoriteList=Edit a favorite list +pollen.title.editPoll=Edit a poll pollen.title.favoriteLists=Your favorite lists pollen.title.myAccount=My account pollen.title.pollsCreatedList=Polls created Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-18 10:42:01 UTC (rev 3512) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-18 11:38:22 UTC (rev 3513) @@ -327,13 +327,13 @@ pollen.tab.poll.options=Options pollen.title.clone.poll=Clonage d'un sondage pollen.title.close.poll=Fermeture d'un sondage -pollen.title.editPoll=Modifier un sondage pollen.title.createPoll=Nouveau sondage pollen.title.delete.poll=Suppression d'un sondage pollen.title.delete.pollChoice=Suppression d'un choix pollen.title.delete.pollComment=Suppression d'un commentaire pollen.title.delete.pollVote=Suppression d'un vote pollen.title.editFavoriteList=Edition de la liste des favoris +pollen.title.editPoll=Modifier un sondage pollen.title.favoriteLists=Vos listes de votants pollen.title.myAccount=Mon compte pollen.title.pollsCreatedList=Sondages créés