r3188 - in branches/pollen-1.2.6-struts2: pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-persistence/src/main/xmi pollen-services/src/main/java/org/chorem/pollen/services/impl - Pollen-commits

14 Mar 2012

Author: tchemit
Date: 2012-03-14 17:15:21 +0100 (Wed, 14 Mar 2012)
New Revision: 3188

Url: http://chorem.org/repositories/revision/pollen/3188

Log:
fix votingUrl

Modified:
   branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java
   branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo
   branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java
   branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java

Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java
===================================================================

--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java	2012-03-14 16:15:06 UTC (rev 3187)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java	2012-03-14 16:15:21 UTC (rev 3188)
@@ -45,7 +45,12 @@
 
     @Override
     public String getAdminId() {
-        String accountId = getCreator().getAccountId();
+        return getVoteId(getCreator());
+    }
+
+    @Override
+    public String getVoteId(PollAccount account) {
+        String accountId = account.getAccountId();
         return getPollId() + ":" + accountId;
     }
 } //PollImpl

Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo
===================================================================
(Binary files differ)

Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java	2012-03-14 16:15:06 UTC (rev 3187)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java	2012-03-14 16:15:21 UTC (rev 3188)
@@ -38,6 +38,7 @@
 import org.chorem.pollen.business.persistence.PollAccount;
 import org.chorem.pollen.business.persistence.UserAccount;
 import org.chorem.pollen.business.persistence.VotingList;
+import org.chorem.pollen.common.PollType;
 import org.chorem.pollen.services.PollenServiceSupport;
 import org.nuiton.util.StringUtil;
 
@@ -114,11 +115,14 @@
             // Mail au créateur
 
             if (StringUtils.isNotEmpty(poll.getCreator().getEmail())) {
-
+                String voteURL2 = voteURL;
+                if (poll.getPollType() != PollType.FREE) {
+                    voteURL2 += ":" + poll.getCreator().getAccountId();
+                }
                 String subject = l_(locale, "pollen.email.creatorEmail.subject",
                                     pollTitle);
                 String content = l_(locale, "pollen.email.creatorEmail.content",
-                                    pollTitle, voteURL, modifURL);
+                                    pollTitle, voteURL2, modifURL);
 
                 PollEmail pollEmail = createPollEmail(
                         poll.getCreator().getEmail(), subject, content);
@@ -136,12 +140,13 @@
 
                 List<PollEmail> emails = Lists.newArrayList();
                 for (PollAccount account : votingPollAccounts) {
+                    String accountId = account.getAccountId();
                     String accountVoteURL =
-                            voteURL + ":" + account.getAccountId();
+                            voteURL + ":" + accountId;
 
                     String content =
                             l_(locale, "pollen.email.votingEmail.content",
-                               pollTitle, voteURL, accountVoteURL);
+                               pollTitle, accountId, accountVoteURL);
 
                     PollEmail pollEmail = createPollEmail(
                             account.getEmail(), subject, content);

Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java	2012-03-14 16:15:06 UTC (rev 3187)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java	2012-03-14 16:15:21 UTC (rev 3188)
@@ -47,7 +47,6 @@
 import org.chorem.pollen.business.persistence.VotingList;
 import org.chorem.pollen.business.persistence.VotingListDAO;
 import org.chorem.pollen.common.ChoiceType;
-import org.chorem.pollen.common.PollType;
 import org.chorem.pollen.services.PollenServiceSupport;
 import org.chorem.pollen.services.exceptions.PollAccountNotFound;
 import org.chorem.pollen.services.exceptions.PollChoiceNotFoundException;
@@ -251,11 +250,11 @@
 
         // email notification
         EmailService emailService = newService(EmailService.class);
-        emailService.onPollCreated(poll, pollVoteUrl, pollEditUrl);
+        emailService.onPollCreated(result, pollVoteUrl, pollEditUrl);
 
         // feed notification
         PollFeedService pollFeedService = newService(PollFeedService.class);
-        pollFeedService.onPollCreated(poll, pollVoteUrl);
+        pollFeedService.onPollCreated(result, pollVoteUrl);
 
         return result;
     }
@@ -263,21 +262,14 @@
     public String getPollVoteUrl(Poll poll) {
         URL applicationUrl = serviceContext.getApplicationURL();
         StringBuilder url = new StringBuilder(applicationUrl.toString());
-
         url.append("/poll/votefor/").append(poll.getPollId());
-
-        if (poll.getPollType() != PollType.FREE) {
-            url.append(':').append(poll.getCreator().getAccountId());
-        }
         return url.toString();
     }
 
     public String getPollEditUrl(Poll poll) {
         URL applicationUrl = serviceContext.getApplicationURL();
         StringBuilder url = new StringBuilder(applicationUrl.toString());
-
-        url.append("/poll/modification/").append(poll.getPollId());
-        url.append(':').append(poll.getCreator().getAccountId());
+        url.append("/poll/modification/").append(poll.getAdminId());
         return url.toString();
     }

    

r3188 - in branches/pollen-1.2.6-struts2: pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-persistence/src/main/xmi pollen-services/src/main/java/org/chorem/pollen/services/impl

tchemit＠users.chorem.org

tags

participants (1)