October 2010 - Pollen-commits - mailman.cloud.codelutin.com

r3051 - trunk
by tchemit＠users.chorem.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 03:42:04 +0200 (Sun, 17 Oct 2010) New Revision: 3051 Url: http://chorem.org/repositories/revision/pollen/3051 Log: Update mavenpom4redmine to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-14 15:26:33 UTC (rev 3050) +++ trunk/pom.xml 2010-10-17 01:42:04 UTC (rev 3051) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r3050 - in trunk/pollen-ui/src/main/java/org/chorem/pollen/ui: components pages/admin
by fdesbois＠users.chorem.org 14 Oct '10

14 Oct '10

Author: fdesbois Date: 2010-10-14 17:26:33 +0200 (Thu, 14 Oct 2010) New Revision: 3050 Url: http://chorem.org/repositories/revision/pollen/3050 Log: - remove useless public visibility for handlers - format javadoc - reset session when delete user Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java 2010-10-08 23:52:40 UTC (rev 3049) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java 2010-10-14 15:26:33 UTC (rev 3050) @@ -99,13 +99,26 @@ /***************************** EDIT PARTICIPANT FORM **********************/ /** - * FORM EVENTS ORDER -> RENDER : load size of participants dataSource call - * prepareForRender load participants data + * FORM EVENTS ORDER -> RENDER : + * <p /> + * <ul> + * <li>load size of participants dataSource</li> + * <li>call prepareForRender</li> + * <li>load participants data</li> + * </ul> * <p/> - * FORM EVENTS ORDER -> SUBMIT : call prepareForSubmit load size of - * participants dataSource load participants data load participantEdited to - * push form data (hidden fields in first) call selected on submit button - * call validateForm call success or failure call submit + * FORM EVENTS ORDER -> SUBMIT : + * <p /> + * <ul> + * <li>all prepareForSubmit</li> + * <li>load size of participants dataSource</li> + * <li>load participants data</li> + * <li>load participantEdited to push form data (hidden fields in first)</li> + * <li>call selected on submit button</li> + * <li>call validateForm</li> + * <li>call success or failure</li> + * <li>call submit</li> + * </ul> */ @InjectComponent Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java 2010-10-08 23:52:40 UTC (rev 3049) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java 2010-10-14 15:26:33 UTC (rev 3050) @@ -73,7 +73,7 @@ /** Services used by the page * */ @Inject - private Logger logger; + private Logger log; @Inject private ComponentResources resources; @@ -153,9 +153,9 @@ * @param login key of the user from the Grid * @return the usersForm to display form with accountEdited */ - public Object onActionFromEditAccount(String login) { - if (logger.isDebugEnabled()) { - logger.debug("User in edition : " + login); + Object onActionFromEditAccount(String login) { + if (log.isDebugEnabled()) { + log.debug("User in edition : " + login); } accountEdited = accounts.get(login); return usersForm; @@ -168,8 +168,9 @@ * @param login used to delete the user * @see ServiceUser#deleteUser(String) */ - public void onActionFromDeleteAccount(String login) { + void onActionFromDeleteAccount(String login) { serviceUser.deleteUser(login); + resources.discardPersistentFieldChanges(); } /** @@ -177,7 +178,7 @@ * usersForm. The accountEdited will be initialized to properly be saved in * {@link #onValidateFormFromUsersForm()} */ - public void onPrepareForSubmitFromUsersForm() { + void onPrepareForSubmitFromUsersForm() { if (accountEdited == null) { accountEdited = serviceUser.getNewUser(); } @@ -190,13 +191,11 @@ * * @see ServiceUser#updateUser(UserAccount, boolean) */ - public void onValidateFormFromUsersForm() { + void onValidateFormFromUsersForm() { try { serviceUser.updateUser(accountEdited, true); } catch (PollenBusinessException eee) { -// String message = manager.getErrorMessage(eee, messages, logger); -// usersForm.recordError(message); - manager.recordFormError(logger, messages, eee, usersForm); + manager.recordFormError(log, messages, eee, usersForm); } } @@ -206,7 +205,7 @@ * * @return the current page to refresh */ - public Object onSuccessFromUsersForm() { + Object onSuccessFromUsersForm() { addInfo(messages.get("pollen.ui.user.update.success")); return this; } @@ -218,7 +217,7 @@ * * @return the usersForm to refresh (in the usersZone) */ - public Object onFailureFromUsersForm() { + Object onFailureFromUsersForm() { return usersForm; } @@ -245,7 +244,7 @@ * ON_PREPARE :: Callback method for prepare events of the newUserForm. The * newUser will be initialized if needed before render and before submit. */ - public void onPrepareFromNewUserForm() { + void onPrepareFromNewUserForm() { if (newUser == null) { newUser = serviceUser.getNewUser(); } @@ -260,7 +259,7 @@ * * @see ServiceUser#createUser(UserAccount) */ - public void onValidateFormFromNewUserForm() { + void onValidateFormFromNewUserForm() { try { String passwordInfo; if (StringUtils.isNotEmpty(newUser.getEmail())) { @@ -279,7 +278,7 @@ serviceUser.createUser(newUser); addInfo(passwordInfo); } catch (PollenBusinessException eee) { - String message = manager.getErrorMessage(logger, messages, eee); + String message = manager.getErrorMessage(log, messages, eee); switch (eee.getType()) { case USER_EMAIL_EXIST: newUserForm.recordError(newEmail, message); @@ -297,10 +296,9 @@ * fields of the page will be discarded to refresh the grid with no order or * page filter. * - * @return the current page to refresh * @see ServiceEmail#sendEmail(PollenEmail) */ - public Object onSuccessFromNewUserForm() { + void onSuccessFromNewUserForm() { addInfo(messages.format("pollen.ui.user.create.success", newUser.getLogin())); // send email if needed @@ -320,7 +318,7 @@ newUser.getLogin(), newUser.getEmail())); } catch (PollenBusinessException eee) { - String message = manager.getErrorMessage(logger, messages, eee); + String message = manager.getErrorMessage(log, messages, eee); addError(message); addInfo(messages.format( "pollen.ui.user.create.emailFailedShowPassword", @@ -330,7 +328,6 @@ // Remove accounts to reset order and current page // This will display the new user created in the first row of the grid resources.discardPersistentFieldChanges(); - return this; } /** @@ -340,7 +337,7 @@ * * @return the newUserForm to refresh (in the newUserZone) */ - public Object onFailureFromNewUserForm() { + Object onFailureFromNewUserForm() { return newUserForm; } }

1 0

r3049 - trunk
by tchemit＠users.chorem.org 08 Oct '10

08 Oct '10

Author: tchemit Date: 2010-10-09 01:52:40 +0200 (Sat, 09 Oct 2010) New Revision: 3049 Url: http://chorem.org/repositories/revision/pollen/3049 Log: Update mavenpom4redmine to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:58:15 UTC (rev 3048) +++ trunk/pom.xml 2010-10-08 23:52:40 UTC (rev 3049) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <groupId>org.chorem</groupId>

1 0

r3048 - trunk
by tchemit＠users.chorem.org 03 Oct '10

03 Oct '10

Author: tchemit Date: 2010-10-03 17:58:15 +0200 (Sun, 03 Oct 2010) New Revision: 3048 Url: http://chorem.org/repositories/revision/pollen/3048 Log: Update mavenpom4redmine to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:12:38 UTC (rev 3047) +++ trunk/pom.xml 2010-10-03 15:58:15 UTC (rev 3048) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <version>2.3</version> </parent> <groupId>org.chorem</groupId>

1 0