[pollen] branch feature/Notification updated (10e74d5 -> 47a8f2d)
This is an automated email from the git hooks/post-receive script. New change to branch feature/Notification in repository pollen. See http://git.chorem.org/pollen.git from 10e74d5 no send notify when close poll new 1ee42f4 move include sticky-inline-poll.js for use optimized cache new 47a8f2d auto validate default users The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 47a8f2d90d3f9873a95b58e7a23b09261d1cf155 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 14:29:59 2014 +0200 auto validate default users commit 1ee42f4af6ae0e1993b9a6920e602d1c41e94869 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 12:18:27 2014 +0200 move include sticky-inline-poll.js for use optimized cache Summary of changes: .../pollen/services/service/PollenUserService.java | 45 +++++++++++++++++----- pollen-ui-angular/src/main/webapp/index.html | 2 + .../src/main/webapp/partials/inline-poll.html | 2 - 3 files changed, 37 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/Notification in repository pollen. See http://git.chorem.org/pollen.git commit 1ee42f4af6ae0e1993b9a6920e602d1c41e94869 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 12:18:27 2014 +0200 move include sticky-inline-poll.js for use optimized cache --- pollen-ui-angular/src/main/webapp/index.html | 2 ++ pollen-ui-angular/src/main/webapp/partials/inline-poll.html | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index a78a415..68fdf3e 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -187,6 +187,8 @@ <script language="javascript" type="text/javascript" src="i18n/fr.js"></script> <script language="javascript" type="text/javascript" src="i18n/en.js"></script> + + <script language="javascript" type="text/javascript" src="js/scripts/sticky-inline-poll.js"></script> </body> </html> diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 9b886c6..822f7da 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -146,5 +146,3 @@ </tr> <!-- end print vote --> </table> - -<script language="javascript" type="text/javascript" src="../js/scripts/sticky-inline-poll.js"></script> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/Notification in repository pollen. See http://git.chorem.org/pollen.git commit 47a8f2d90d3f9873a95b58e7a23b09261d1cf155 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 14:29:59 2014 +0200 auto validate default users --- .../pollen/services/service/PollenUserService.java | 45 +++++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index 108231f..70751f1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -36,6 +36,7 @@ import org.chorem.pollen.services.service.security.PollenInvalidPasswordExceptio import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -230,19 +231,43 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer if (getPollenUserDao().count() == 0) { - PollenUserBean user = new PollenUserBean(); + List<PollenUserBean> listUser = new ArrayList<>(); - user.setAdministrator(true); - user.setEmail("admin@pollen.org"); - user.setPassword("admin"); - createUser(user, false); + { // set users + PollenUserBean user = new PollenUserBean(); - user = new PollenUserBean(); + user.setAdministrator(true); + user.setEmail("admin@pollen.org"); + user.setPassword("admin"); - user.setAdministrator(false); - user.setEmail("user@pollen.org"); - user.setPassword("user"); - createUser(user, false); + listUser.add(user); + + user = new PollenUserBean(); + + user.setAdministrator(false); + user.setEmail("user@pollen.org"); + user.setPassword("user"); + + listUser.add(user); + + } + + + for (PollenUserBean user : listUser) { + + // create user + PollenEntityRef<PollenUser> newUser = createUser(user, false); + + // validate user + PollenUser pollenUser = getPollenUserDao().forTopiaIdEquals(newUser.getEntityId()).findUnique(); + + try { + validateUserEmail(newUser.getEntityId(), pollenUser.getEmailActivationToken().getToken()); + } catch (PollenInvalidEmailActivationTokenException e) { + e.printStackTrace(); + } + + } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm