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

01/01: use only email as login
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 220b166c5ef0c4f91b7be676e7a85fcddca3fe1f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 28 20:42:24 2014 +0200 use only email as login --- .../persistence/entity/PollenUserTopiaDao.java | 5 -- pollen-persistence/src/main/xmi/pollen.zargo | Bin 18501 -> 18454 bytes .../org/chorem/pollen/rest/api/JsonHelper.java | 4 +- .../org/chorem/pollen/rest/api/AuthApiTest.java | 8 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 4 +- .../pollen/services/bean/PollenUserBean.java | 12 --- .../pollen/services/service/PollenUserService.java | 18 +---- .../service/security/PollenSecurityRealm.java | 2 +- .../services/service/security/SecurityService.java | 4 +- pollen-services/src/main/resources/fixtures.yaml | 3 - .../services/service/PollenUserServiceTest.java | 28 ++++--- pollen-ui-angular/src/main/webapp/index.html | 8 +- .../src/main/webapp/js/controllers/userCtrl.js | 2 +- .../src/main/webapp/partials/user-edit.html | 2 +- .../src/main/webapp/partials/user-login.html | 2 +- .../src/main/webapp/partials/user-register.html | 82 +++++++++------------ 16 files changed, 69 insertions(+), 115 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java index f1331fa..b040a79 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java @@ -31,11 +31,6 @@ import java.util.List; */ public class PollenUserTopiaDao extends AbstractPollenUserTopiaDao<PollenUser> { - public boolean loginExists(String login) { - boolean exists = forLoginEquals(login).exists(); - return exists; - } - public boolean emailExists(String email) { boolean exists = forEmailEquals(email).exists(); return exists; diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index 13a00d2..271cc74 100644 Binary files a/pollen-persistence/src/main/xmi/pollen.zargo and b/pollen-persistence/src/main/xmi/pollen.zargo differ diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/JsonHelper.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/JsonHelper.java index 863a2b1..e30c5a4 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/JsonHelper.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/JsonHelper.java @@ -134,7 +134,9 @@ public class JsonHelper { src.encode(idFactory); JsonObject object = new JsonObject(); - object.add("permission", new JsonPrimitive(src.getPermission())); + if (src.getPermission()!=null) { + object.add("permission", new JsonPrimitive(src.getPermission())); + } object.add("id", new JsonPrimitive(src.getReducedId())); result = object; diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java index 308447b..fdef569 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java @@ -46,7 +46,7 @@ public class AuthApiTest extends AbstractPollenRestApiTest { public void login() throws URISyntaxException, IOException { Request request = createRequest("/v1/login") - .addParameter("login", "admin") + .addParameter("login", "admin(a)pollen.org") .addParameter("password", "admin") .Post(); @@ -60,7 +60,7 @@ public class AuthApiTest extends AbstractPollenRestApiTest { public void loginThenLogout() throws URISyntaxException, IOException { Request login = createRequest("/v1/login") - .addParameter("login", "admin") + .addParameter("login", "admin(a)pollen.org") .addParameter("password", "admin") .Post(); @@ -85,7 +85,7 @@ public class AuthApiTest extends AbstractPollenRestApiTest { public void badLogin() throws URISyntaxException, IOException { Request request = createRequest("/v1/login") - .addParameter("login", "admin" + System.nanoTime()) + .addParameter("login", "admin(a)pollen.org" + System.nanoTime()) .addParameter("password", "admin" + System.nanoTime()) .Post(); @@ -99,7 +99,7 @@ public class AuthApiTest extends AbstractPollenRestApiTest { public void badPassword() throws URISyntaxException, IOException { Request request = createRequest("/v1/login") - .addParameter("login", "admin") + .addParameter("login", "admin(a)pollen.org") .addParameter("password", "admin" + System.nanoTime()) .Post(); diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserApiTest.java index 18bf5bb..16e2b2f 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserApiTest.java @@ -78,7 +78,7 @@ public class PollenUserApiTest extends AbstractPollenRestApiTest { @Test public void getUsers() throws Exception { - String sessionToken = login("admin", "admin"); + String sessionToken = login("admin(a)pollen.org", "admin"); Request request = createRequest("/v1/users").Get(); request.addHeader(PollenRestApiRequestFilter.REQUEST_HEADER_SESSION_TOKEN, sessionToken); @@ -91,7 +91,7 @@ public class PollenUserApiTest extends AbstractPollenRestApiTest { @Test public void getUser() throws Exception { - String sessionToken = login("admin", "admin"); + String sessionToken = login("admin(a)pollen.org", "admin"); PollenUser pollenUser = fixture("user_jean"); String userId = encodeId(pollenUser.getTopiaId()); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenUserBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenUserBean.java index 5fb38d1..b9e1239 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenUserBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenUserBean.java @@ -32,8 +32,6 @@ import org.chorem.pollen.persistence.entity.PollenUserImpl; */ public class PollenUserBean extends PollenBean<PollenUser> { - protected String login; - protected String name; protected boolean administrator; @@ -54,7 +52,6 @@ public class PollenUserBean extends PollenBean<PollenUser> { setEntityId(entity.getTopiaId()); setName(entity.getName()); - setLogin(entity.getLogin()); setAdministrator(entity.isAdministrator()); setLanguage(entity.getLanguage()); setEmail(entity.getEmail()); @@ -69,7 +66,6 @@ public class PollenUserBean extends PollenBean<PollenUser> { entity.setTopiaId(getEntityId()); entity.setName(getName()); - entity.setLanguage(getLogin()); entity.setAdministrator(isAdministrator()); entity.setLanguage(getLanguage()); entity.setEmail(getEmail()); @@ -79,14 +75,6 @@ public class PollenUserBean extends PollenBean<PollenUser> { } - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - public String getName() { return name; } 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 21729b2..e7e3417 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 @@ -179,8 +179,6 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer PollenUserBean user = new PollenUserBean(); user.setAdministrator(true); - String login = "admin"; - user.setLogin(login); user.setEmail("admin(a)pollen.org"); user.setPassword("admin"); createUser(user, false); @@ -188,8 +186,6 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer user = new PollenUserBean(); user.setAdministrator(false); - login = "user"; - user.setLogin(login); user.setEmail("user(a)pollen.org"); user.setPassword("user"); createUser(user, false); @@ -206,24 +202,14 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer PollenUser persisted = userExists ? getUser0(user.getEntityId()) : null; PollenUserTopiaDao dao = getPollenUserDao(); - String userLogin = user.getLogin(); String userEmail = getCleanMail(user.getEmail()); - boolean loginNotBlank = checkNotBlank(errors, "login", userLogin, "login can not be empty"); - - if (loginNotBlank && !userExists) { - - check(errors, "login", !dao.loginExists(userLogin), "login already exists"); - - } - boolean emailNotblank = checkNotBlank(errors, "email", userEmail, "email can not be empty"); if (emailNotblank) { checkValidEmail(errors, "email", userEmail, "email is not valid"); - if (userExists) { // check if email is available only if has changed @@ -244,7 +230,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } - boolean passwordNotBlank = checkNotBlank(errors, "password", userLogin, "password can not be empty"); + boolean passwordNotBlank = checkNotBlank(errors, "password", user.getPassword() , "password can not be empty"); if (userExists && passwordNotBlank) { @@ -304,7 +290,6 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer PollenToken emailActivation = getSecurityService().generateNewToken(); toSave = getPollenUserDao().create(); - toSave.setLogin(user.getLogin()); toSave.setEmailActivationToken(emailActivation); getSecurityService().setUserPassword(toSave, password); @@ -341,5 +326,4 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } - } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java index f873a75..2c37561 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java @@ -84,7 +84,7 @@ public class PollenSecurityRealm extends AuthorizingRealm { try { PollenUser pollenUser = - persistenceContext.getPollenUserDao().forLoginEquals(username).findUniqueOrNull(); + persistenceContext.getPollenUserDao().forEmailEquals(username).findUniqueOrNull(); if (pollenUser == null) { throw new AuthenticationException(); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index 2b2246c..a5d0359 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -80,7 +80,7 @@ public class SecurityService extends PollenServiceSupport { throw new PollenAuthenticationException(e); } - PollenUser user = getPollenUserDao().forLoginEquals(login).findUnique(); + PollenUser user = getPollenUserDao().forEmailEquals(login).findUnique(); // Generate a token PollenToken pollenToken = generateNewToken(); @@ -122,7 +122,7 @@ public class SecurityService extends PollenServiceSupport { Preconditions.checkNotNull(login); - PollenUser user = getPollenUserDao().forLoginEquals(login).findUnique(); + PollenUser user = getPollenUserDao().forEmailEquals(login).findUnique(); String newPassword = serviceContext.generatePassword(); diff --git a/pollen-services/src/main/resources/fixtures.yaml b/pollen-services/src/main/resources/fixtures.yaml index 9388393..6f02abe 100644 --- a/pollen-services/src/main/resources/fixtures.yaml +++ b/pollen-services/src/main/resources/fixtures.yaml @@ -1,6 +1,5 @@ user_tony: &tony !user - login: tony password: fake name: T email: tony(a)pollen.fake @@ -8,7 +7,6 @@ user_tony: user_jean: &jean !user - login: jean password: fake name: J email: jean(a)pollen.fake @@ -16,7 +14,6 @@ user_jean: user_julien: &julien !user - login: julien password: fake name: J email: julien(a)pollen.fake diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java index 0cdac80..80df789 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java @@ -66,7 +66,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { @Test public void testGetPollenUsers() throws PollenAuthenticationException, PollenInvalidSessionTokenException { - login("jean", "fake"); + login("jean(a)pollen.fake", "fake"); PaginationResultBean<PollenUserBean> users = service.getUsers(null); @@ -78,7 +78,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { @Test public void testGetPollenUser() throws PollenInvalidSessionTokenException, PollenAuthenticationException { - login("jean", "fake"); + login("jean(a)pollen.fake", "fake"); try { service.getUser("pollen_user_tony_" + System.nanoTime()); @@ -107,27 +107,35 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { } PollenUserBean newUser = new PollenUserBean(); - newUser.setLogin("pollen"); newUser.setEmail("pollen(a)pollen.org"); + try { + service.createUser(newUser, true); + Assert.fail(); + } catch (InvalidFormException e) { + // no password + assertErrorKeyFound(e, "password"); + } + newUser.setPassword("password"); + PollenEntityRef<PollenUser> savedUser = service.createUser(newUser, true); Assert.assertNotNull(savedUser); Assert.assertNotNull(savedUser.getEntityId()); PollenUserBean newUser2 = new PollenUserBean(); - newUser2.setLogin("pollen"); newUser2.setEmail("pollen(a)pollen.org"); try { service.createUser(newUser2, true); Assert.fail(); } catch (InvalidFormException e) { - // not available login + // no password // not available email - assertErrorKeyFound(e, "login", "email"); + assertErrorKeyFound(e, "password", "email"); } - newUser2.setLogin("pollen2"); + newUser2.setPassword("password"); + try { service.createUser(newUser2, true); Assert.fail(); @@ -145,7 +153,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { @Test public void testEditUser() throws InvalidFormException, PollenInvalidSessionTokenException, PollenAuthenticationException { - login("jean", "fake"); + login("jean(a)pollen.fake", "fake"); PollenUserBean user = service.getUser(this.user.getTopiaId()); user.setPassword("password"); @@ -155,9 +163,6 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { // getServiceContext().getPersistenceContext().getHibernateSupport().getHibernateSession().evict(user); - String originalLogin = user.getLogin(); - - user.setLogin("yetanotherlogin"); String email = "tony(a)pollen.org"; user.setEmail(email); @@ -174,7 +179,6 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { PollenUserBean savedUser = service.getUser(user.getEntityId()); Assert.assertNotNull(savedUser); - Assert.assertEquals(originalLogin, savedUser.getLogin()); Assert.assertEquals(email, savedUser.getEmail()); // Assert.assertNotNull(savedUser.getEmailActivationToken()); } diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 6778c75..173af00 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -53,13 +53,13 @@ <li><a href="#/poll/create">Creer</a></li> </ul> <ul class="nav navbar-nav pull-right"> - <li ng-show="!currentUser.login"> + <li ng-show="!currentUser.id"> <a href="#/user/register/">S'enregistrer</a> </li> - <li class="divider-vertical" ng-show="!currentUser.login"></li> + <li class="divider-vertical" ng-show="!currentUser.id"></li> - <li ng-show="!currentUser.login" dropdown> + <li ng-show="!currentUser.id" dropdown> <a href="#" role="button" class="dropdown-toggle"> Connexion<strong class="caret"></strong> </a> @@ -81,7 +81,7 @@ </ul> </li> - <li class="dropdown" ng-show="currentUser.login"> + <li class="dropdown" ng-show="currentUser.id"> <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> {{ currentUser.name || currentUser.login }} <strong class="caret"></strong> </a> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 2340bcf..218f6df 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -24,7 +24,7 @@ if (!angular.isDefined($scope.data)) { $scope.data = {}; } - $scope.data.user = {login:'', email:'', password:'', password2:''}; + $scope.data.user = {email:'', password:'', password2:''}; $scope.submit = function () { if ($scope.data.user.password == $scope.data.user.password2) { diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html index dda3568..53ef5ce 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -37,7 +37,7 @@ <div class="control-group"> <label for="formEmail" class="col-sm-5 text-right control-label"> - Adresse E-Mail + Courriel </label> <div class="col-sm-6"> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html index a14be4c..5d8f8e4 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-login.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -2,7 +2,7 @@ <div class="control-group"> <label class="control-label"> - Nom d'Utilisateur + Courriel <info-error error="restError.connexion" data="data.user"></info-error> </label> <input type="text" name='login' ng-model="data.user.login" class="form-control"/> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index c658c84..6ae1a8f 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -18,21 +18,42 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> - <h2> Inscription sur Pollen</h2> + <h2>Créer un compte</h2> <form ng-submit="submit()" class="form-horizontal"> - <div class="control-group"> - <label for="formLogin" class="col-sm-5 text-right control-label"> - Identifiant - </label> - <div class="col-sm-6"> - <input type="text" id="formLogin" name="login" class="form-control" ng-model="data.user.login"/> + + <div class="control-group"> + + <label for="formEmail" class="col-sm-5 text-right control-label"> + Courriel + </label> + + <div class="col-sm-6"> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="data.user.email"></info-error> + </div> </div> - <div class="col-sm-1"> - <info-error error="restError.login[0]" data="data.user.login"></info-error> + + <div class="control-group"> + <label for="formName" class="col-sm-5 text-right control-label"> + Nom + </label> + <div class="col-sm-6"> + <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/> + </div> + <div class="col-sm-1"> + </div> </div> - </div> - <div class="control-group"> + + <div> + <div class="col-sm-3"></div> + <div class="col-sm-8"><hr/></div> + <div class="col-sm-1"></div> + </div> + + <div class="control-group"> <label for="formPassword" class="col-sm-5 text-right control-label"> Mot de passe </label> @@ -52,47 +73,10 @@ </div> </div> - <div> - <div class="col-sm-3"></div> - <div class="col-sm-8"><hr/></div> - <div class="col-sm-1"></div> - </div> - - <div class="control-group"> - - <label for="formEmail" class="col-sm-5 text-right control-label"> - Courriel - </label> - - <div class="col-sm-6"> - <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> - </div> - <div class="col-sm-1"> - <info-error error="restError.email[0]" data="data.user.email"></info-error> - </div> - </div> - - <div class="control-group"> - <label for="formName" class="col-sm-5 text-right control-label"> - Nom d'utilisateur - </label> - <div class="col-sm-6"> - <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/> - </div> - <div class="col-sm-1"> - </div> - </div> - - <div> - <div class="col-sm-3"></div> - <div class="col-sm-8"><hr /></div> - <div class="col-sm-1"></div> - </div> - <div class="control-group"> <div class="col-sm-5"></div> <div class="col-sm-6"> - <button class="btn btn-primary" type="submit">Envoyer</button> + <button class="btn btn-primary" type="submit">S'enregister</button> </div> <div class="col-sm-1"></div> </div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: beautifull form for register
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit a66900491967d2985e5bbe19c938c2f6743203f5 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 17:59:35 2014 +0200 beautifull form for register --- .../src/main/webapp/partials/user-register.html | 54 +++++++++++++++------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 982c6fc..c658c84 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -21,11 +21,11 @@ <h2> Inscription sur Pollen</h2> <form ng-submit="submit()" class="form-horizontal"> <div class="control-group"> - <label for="formName" class="col-sm-5 text-right control-label"> - Nom d'utilisateur + <label for="formLogin" class="col-sm-5 text-right control-label"> + Identifiant </label> <div class="col-sm-6"> - <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> + <input type="text" id="formLogin" name="login" class="form-control" ng-model="data.user.login"/> </div> <div class="col-sm-1"> <info-error error="restError.login[0]" data="data.user.login"></info-error> @@ -33,39 +33,61 @@ </div> <div class="control-group"> - - <label for="formEmail" class="col-sm-5 text-right control-label"> - Adresse E-Mail + <label for="formPassword" class="col-sm-5 text-right control-label"> + Mot de passe </label> - <div class="col-sm-6"> - <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> + <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> + </div> + </div> + <div class="control-group"> + <label for="formPassword2" class="col-sm-5 text-right control-label"> + Confirmation + </label> + <div class="col-sm-6"> + <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> </div> <div class="col-sm-1"> - <info-error error="restError.email[0]" data="data.user.email"></info-error> + <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> </div> </div> + <div> + <div class="col-sm-3"></div> + <div class="col-sm-8"><hr/></div> + <div class="col-sm-1"></div> + </div> + <div class="control-group"> - <label for="formPassword" class="col-sm-5 text-right control-label"> - Mot de passe + + <label for="formEmail" class="col-sm-5 text-right control-label"> + Courriel </label> + <div class="col-sm-6"> - <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="data.user.email"></info-error> </div> </div> + <div class="control-group"> - <label for="formPassword2" class="col-sm-5 text-right control-label"> - Confirmation + <label for="formName" class="col-sm-5 text-right control-label"> + Nom d'utilisateur </label> <div class="col-sm-6"> - <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> + <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/> </div> <div class="col-sm-1"> - <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> </div> </div> + <div> + <div class="col-sm-3"></div> + <div class="col-sm-8"><hr /></div> + <div class="col-sm-1"></div> + </div> <div class="control-group"> <div class="col-sm-5"></div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix password in form
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 874c7ac4e5dcb1df4148ebd066049ebd286229d2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 28 17:51:51 2014 +0200 fix password in form --- .../java/org/chorem/pollen/services/service/PollenUserService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 1df2fa3..21729b2 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 @@ -217,8 +217,6 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } - checkNotBlank(errors, "password", userLogin, "password can not be empty"); - boolean emailNotblank = checkNotBlank(errors, "email", userEmail, "email can not be empty"); if (emailNotblank) { @@ -246,7 +244,9 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } - if (userExists) { + boolean passwordNotBlank = checkNotBlank(errors, "password", userLogin, "password can not be empty"); + + if (userExists && passwordNotBlank) { // check current password -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: update style of form
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit b31fdd395c8d7edc133e9b2751f3e2074dd41743 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 17:33:34 2014 +0200 update style of form --- pollen-ui-angular/src/main/webapp/css/style.css | 5 +++++ .../src/main/webapp/partials/user-edit.html | 16 ++++++++-------- .../src/main/webapp/partials/user-register.html | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index 66fad89..dcdd462 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -229,3 +229,8 @@ i.icon-collapse { width:200px; border-right:1px solid #DDD; } + +.container .control-group .form-control, .container .control-group .control-label { + margin-bottom:15px; + vertical-align:center; +} diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html index 5c29acf..dda3568 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -24,10 +24,10 @@ <form class="horizontal-form" ng-submit="editUser()"> <div class="control-group"> - <label for="formName" class="col-sm-3 text-right control-label"> + <label for="formName" class="col-sm-5 text-right control-label"> Nom </label> - <div class="col-sm-8"> + <div class="col-sm-6"> <input type="text" id="formName" class="form-control" ng-model="currentUser.name"/> </div> <div class="col-sm-1"> @@ -36,11 +36,11 @@ <div class="control-group"> - <label for="formEmail" class="col-sm-3 text-right control-label"> + <label for="formEmail" class="col-sm-5 text-right control-label"> Adresse E-Mail </label> - <div class="col-sm-8"> + <div class="col-sm-6"> <input type="email" id="formEmail" name="email" class="form-control" ng-model="currentUser.email"/> </div> <div class="col-sm-1"> @@ -49,10 +49,10 @@ </div> <div class="control-group"> - <label for="formPassword" class="col-sm-3 text-right control-label"> + <label for="formPassword" class="col-sm-5 text-right control-label"> Mot de passe Actuel </label> - <div class="col-sm-8"> + <div class="col-sm-6"> <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password"/> </div> <div class="col-sm-1"> @@ -61,8 +61,8 @@ </div> <div class="control-group"> - <div class="col-sm-3"></div> - <div class="col-sm-8"> + <div class="col-sm-5"></div> + <div class="col-sm-6"> <button class="btn btn-primary" type="submit">Envoyer</button> </div> <div class="col-sm-1"></div> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index eb37772..982c6fc 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -21,10 +21,10 @@ <h2> Inscription sur Pollen</h2> <form ng-submit="submit()" class="form-horizontal"> <div class="control-group"> - <label for="formName" class="col-sm-3 text-right control-label"> + <label for="formName" class="col-sm-5 text-right control-label"> Nom d'utilisateur </label> - <div class="col-sm-8"> + <div class="col-sm-6"> <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> </div> <div class="col-sm-1"> @@ -34,11 +34,11 @@ <div class="control-group"> - <label for="formEmail" class="col-sm-3 text-right control-label"> + <label for="formEmail" class="col-sm-5 text-right control-label"> Adresse E-Mail </label> - <div class="col-sm-8"> + <div class="col-sm-6"> <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> </div> <div class="col-sm-1"> @@ -47,18 +47,18 @@ </div> <div class="control-group"> - <label for="formPassword" class="col-sm-3 text-right"> + <label for="formPassword" class="col-sm-5 text-right control-label"> Mot de passe </label> - <div class="col-sm-8"> + <div class="col-sm-6"> <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> </div> <div class="control-group"> - <label for="formPassword2" class="col-sm-3 text-right"> + <label for="formPassword2" class="col-sm-5 text-right control-label"> Confirmation </label> - <div class="col-sm-8"> + <div class="col-sm-6"> <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> </div> <div class="col-sm-1"> @@ -68,8 +68,8 @@ <div class="control-group"> - <div class="col-sm-3"></div> - <div class="col-sm-8"> + <div class="col-sm-5"></div> + <div class="col-sm-6"> <button class="btn btn-primary" type="submit">Envoyer</button> </div> <div class="col-sm-1"></div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add form for edit user
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 895a0d687a282fc4ae1cef4f00389f7d7e89ad0b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 16:58:57 2014 +0200 add form for edit user --- pollen-rest-api/src/main/resources/mapping | 12 ++-- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 14 +++++ pollen-ui-angular/src/main/webapp/js/services.js | 4 +- .../src/main/webapp/partials/user-edit.html | 70 ++++++++++++++++++++++ .../src/main/webapp/partials/user-register.html | 9 ++- 7 files changed, 100 insertions(+), 12 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index da2368c..fe48ec3 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -115,12 +115,12 @@ PUT /v1/polls/{pollId}/close PollApi.closePoll # PollenUserApi -GET /v1/users PollenUserApi.getUsers -GET /v1/users/{userId} PollenUserApi.getUser -POST /v1/users PollenUserApi.createUser -PUT /v1/users/{userId} PollenUserApi.editUser -DELETE /v1/users/{userId} PollenUserApi.deleteUser -PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail +GET /v1/users PollenUserApi.getUsers +GET /v1/users/{userId} PollenUserApi.getUser +POST /v1/users PollenUserApi.createUser +PUT,POST /v1/users/{userId} PollenUserApi.editUser +DELETE /v1/users/{userId} PollenUserApi.deleteUser +PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail # VoteCountingApi diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index ce64f62..6778c75 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -88,7 +88,7 @@ <ul class="dropdown-menu" role="menu"> <li> - <a href="#/user/edit/{{currentUser.id}}">Profile</a> + <a href="#/user/edit">Profile</a> </li> <li class="divider"></li> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index da816a1..1a252fa 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -68,6 +68,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) + .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) .otherwise({redirectTo: '/'}); }]) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 8f4a71f..2340bcf 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,6 +36,20 @@ } }]) +.controller('UserEditCtrl', ['$scope', 'User', 'SessionStorage', function ($scope, User, SessionStorage) { + $scope.currentUser = SessionStorage.get().user; + $scope.currentUser.password = ''; + + $scope.editUser = function () { + User.update($scope.currentUser, function (data) { + SessionStorage.save({user:data}); + $scope.saved = true; + }, function (error) { + $scope.restError = error.data; + }); + } +}]) + .controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', '$location', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route, $location) { if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 785de6f..8171f52 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -79,7 +79,7 @@ angular.module('pollenServices', ['ngResource']) }, 'update' : { - method:'PUT', + method:'POST', transformRequest : function (data, headersGetter) { return transformParam(data); } @@ -126,7 +126,7 @@ angular.module('pollenServices', ['ngResource']) }, 'update' : { - method:'PUT', + method:'POST', transformRequest : function (data, headersGetter) { return transformParam(data); } diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html new file mode 100644 index 0000000..5c29acf --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -0,0 +1,70 @@ + +<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Modification effectuée..</alert> + +<h2> Modification du Profile </h2> + +<form class="horizontal-form" ng-submit="editUser()"> + <div class="control-group"> + <label for="formName" class="col-sm-3 text-right control-label"> + Nom + </label> + <div class="col-sm-8"> + <input type="text" id="formName" class="form-control" ng-model="currentUser.name"/> + </div> + <div class="col-sm-1"> + </div> + </div> + + <div class="control-group"> + + <label for="formEmail" class="col-sm-3 text-right control-label"> + Adresse E-Mail + </label> + + <div class="col-sm-8"> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="currentUser.email"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="currentUser.email"></info-error> + </div> + </div> + + <div class="control-group"> + <label for="formPassword" class="col-sm-3 text-right control-label"> + Mot de passe Actuel + </label> + <div class="col-sm-8"> + <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.password[0]" data="currentUser.password"></info-error> + </div> + </div> + + <div class="control-group"> + <div class="col-sm-3"></div> + <div class="col-sm-8"> + <button class="btn btn-primary" type="submit">Envoyer</button> + </div> + <div class="col-sm-1"></div> + </div> +</form> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 81cf1c3..eb37772 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -19,7 +19,6 @@ #L% --> <h2> Inscription sur Pollen</h2> - <br/><br/><br/> <form ng-submit="submit()" class="form-horizontal"> <div class="control-group"> <label for="formName" class="col-sm-3 text-right control-label"> @@ -68,7 +67,11 @@ </div> - <div class="form-group"> - <button class="btn btn-primary" type="submit">Envoyer</button> + <div class="control-group"> + <div class="col-sm-3"></div> + <div class="col-sm-8"> + <button class="btn btn-primary" type="submit">Envoyer</button> + </div> + <div class="col-sm-1"></div> </div> </form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add form for edit user
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 968ff64a7febc268a5c8fbdfeb2aef18b1d07d7b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 16:58:57 2014 +0200 add form for edit user --- pollen-rest-api/src/main/resources/mapping | 12 ++-- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 14 +++++ pollen-ui-angular/src/main/webapp/js/services.js | 4 +- .../src/main/webapp/partials/user-edit.html | 70 ++++++++++++++++++++++ .../src/main/webapp/partials/user-register.html | 7 ++- 7 files changed, 99 insertions(+), 11 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index da2368c..fe48ec3 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -115,12 +115,12 @@ PUT /v1/polls/{pollId}/close PollApi.closePoll # PollenUserApi -GET /v1/users PollenUserApi.getUsers -GET /v1/users/{userId} PollenUserApi.getUser -POST /v1/users PollenUserApi.createUser -PUT /v1/users/{userId} PollenUserApi.editUser -DELETE /v1/users/{userId} PollenUserApi.deleteUser -PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail +GET /v1/users PollenUserApi.getUsers +GET /v1/users/{userId} PollenUserApi.getUser +POST /v1/users PollenUserApi.createUser +PUT,POST /v1/users/{userId} PollenUserApi.editUser +DELETE /v1/users/{userId} PollenUserApi.deleteUser +PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail # VoteCountingApi diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index ce64f62..6778c75 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -88,7 +88,7 @@ <ul class="dropdown-menu" role="menu"> <li> - <a href="#/user/edit/{{currentUser.id}}">Profile</a> + <a href="#/user/edit">Profile</a> </li> <li class="divider"></li> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index da816a1..1a252fa 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -68,6 +68,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) + .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) .otherwise({redirectTo: '/'}); }]) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 8f4a71f..2340bcf 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,6 +36,20 @@ } }]) +.controller('UserEditCtrl', ['$scope', 'User', 'SessionStorage', function ($scope, User, SessionStorage) { + $scope.currentUser = SessionStorage.get().user; + $scope.currentUser.password = ''; + + $scope.editUser = function () { + User.update($scope.currentUser, function (data) { + SessionStorage.save({user:data}); + $scope.saved = true; + }, function (error) { + $scope.restError = error.data; + }); + } +}]) + .controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', '$location', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route, $location) { if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 785de6f..8171f52 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -79,7 +79,7 @@ angular.module('pollenServices', ['ngResource']) }, 'update' : { - method:'PUT', + method:'POST', transformRequest : function (data, headersGetter) { return transformParam(data); } @@ -126,7 +126,7 @@ angular.module('pollenServices', ['ngResource']) }, 'update' : { - method:'PUT', + method:'POST', transformRequest : function (data, headersGetter) { return transformParam(data); } diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html new file mode 100644 index 0000000..5c29acf --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -0,0 +1,70 @@ + +<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Modification effectuée..</alert> + +<h2> Modification du Profile </h2> + +<form class="horizontal-form" ng-submit="editUser()"> + <div class="control-group"> + <label for="formName" class="col-sm-3 text-right control-label"> + Nom + </label> + <div class="col-sm-8"> + <input type="text" id="formName" class="form-control" ng-model="currentUser.name"/> + </div> + <div class="col-sm-1"> + </div> + </div> + + <div class="control-group"> + + <label for="formEmail" class="col-sm-3 text-right control-label"> + Adresse E-Mail + </label> + + <div class="col-sm-8"> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="currentUser.email"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="currentUser.email"></info-error> + </div> + </div> + + <div class="control-group"> + <label for="formPassword" class="col-sm-3 text-right control-label"> + Mot de passe Actuel + </label> + <div class="col-sm-8"> + <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.password[0]" data="currentUser.password"></info-error> + </div> + </div> + + <div class="control-group"> + <div class="col-sm-3"></div> + <div class="col-sm-8"> + <button class="btn btn-primary" type="submit">Envoyer</button> + </div> + <div class="col-sm-1"></div> + </div> +</form> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 81cf1c3..501edfd 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -19,7 +19,6 @@ #L% --> <h2> Inscription sur Pollen</h2> - <br/><br/><br/> <form ng-submit="submit()" class="form-horizontal"> <div class="control-group"> <label for="formName" class="col-sm-3 text-right control-label"> @@ -69,6 +68,10 @@ <div class="form-group"> - <button class="btn btn-primary" type="submit">Envoyer</button> + <div class="col-sm-3"></div> + <div class="col-sm-8"> + <button class="btn btn-primary" type="submit">Envoyer</button> + </div> + <div class="col-sm-1"></div> </div> </form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: check password is not blank
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 4086dc6e7c158344bb9e542d82a658ed04fec268 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 28 16:29:39 2014 +0200 check password is not blank --- .../java/org/chorem/pollen/services/service/PollenUserService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 f61fe51..1df2fa3 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 @@ -217,6 +217,8 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } + checkNotBlank(errors, "password", userLogin, "password can not be empty"); + boolean emailNotblank = checkNotBlank(errors, "email", userEmail, "email can not be empty"); if (emailNotblank) { @@ -228,8 +230,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer // check if email is available only if has changed - boolean emailChanged = ObjectUtils.notEqual(persisted.getEmail(), - userEmail); + boolean emailChanged = ObjectUtils.notEqual(persisted.getEmail(), userEmail); if (emailChanged) { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: change favoriteDefaultPageSize to favoriteListDefaultPageSize
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit a3c9015b438fa9d1bd258096100639fe88c89fb4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 15:51:36 2014 +0200 change favoriteDefaultPageSize to favoriteListDefaultPageSize --- pollen-ui-angular/src/main/webapp/js/conf.js.exemple | 4 ++-- .../src/main/webapp/partials/user-register.html | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index 1291f2c..adcbae6 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -8,6 +8,6 @@ var conf = { // Comment number per page commentDefaultPageSize : 10, - // Favorite poll number per page - favoriteDefaultPageSize : 15, + // Favorite list number per page + favoriteListDefaultPageSize : 15, } \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 5d0d583..81cf1c3 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -21,8 +21,8 @@ <h2> Inscription sur Pollen</h2> <br/><br/><br/> <form ng-submit="submit()" class="form-horizontal"> - <div class="form-group"> - <label for="formName" class="col-sm-3 text-right"> + <div class="control-group"> + <label for="formName" class="col-sm-3 text-right control-label"> Nom d'utilisateur </label> <div class="col-sm-8"> @@ -33,9 +33,9 @@ </div> </div> - <div class="form-group"> + <div class="control-group"> - <label for="formEmail" class="col-sm-3 text-right"> + <label for="formEmail" class="col-sm-3 text-right control-label"> Adresse E-Mail </label> @@ -47,7 +47,7 @@ </div> </div> - <div class="form-group"> + <div class="control-group"> <label for="formPassword" class="col-sm-3 text-right"> Mot de passe </label> @@ -55,7 +55,7 @@ <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> </div> - <div class="form-group"> + <div class="control-group"> <label for="formPassword2" class="col-sm-3 text-right"> Confirmation </label> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: Add default page size in conf
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 50bb88a50e77a7c36dc9d35425ebf466c933297f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 15:41:10 2014 +0200 Add default page size in conf --- pollen-ui-angular/src/main/webapp/js/conf.js.exemple | 11 ++++++++++- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index f3f7975..1291f2c 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -1,4 +1,13 @@ var conf = { // Rest-API Base Url - restURL : "http://exemple.com/pollen-rest-api/v1" + restURL : "http://exemple.com/pollen-rest-api/v1", + + // Poll number per page + pollDefaultPageSize : 10, + + // Comment number per page + commentDefaultPageSize : 10, + + // Favorite poll number per page + favoriteDefaultPageSize : 15, } \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 0a9165d..58d2b38 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -470,7 +470,7 @@ angular.module('pollControllers', []) } } - $scope.pageSize = 3; + $scope.pageSize = conf.commentDefaultPageSize; $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); var paginationParameter = {pageSize:$scope.pageSize}; @@ -559,7 +559,7 @@ angular.module('pollControllers', []) function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); - $scope.pageSize = 3; + $scope.pageSize = conf.pollDefaultPageSize; $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); var paginationParameter = {pageSize:$scope.pageSize}; -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: update pagination and add pagination in comments
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit a5da89832b2299fb38e30e933d56f6f5188b3b8a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 15:30:47 2014 +0200 update pagination and add pagination in comments --- pollen-ui-angular/src/main/webapp/js/app.js | 12 ++++++-- .../src/main/webapp/js/controllers/pollCtrl.js | 36 +++++++++++++--------- .../src/main/webapp/partials/poll-comment.html | 5 ++- .../src/main/webapp/partials/poll-list.html | 3 +- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 957151b..da816a1 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -199,13 +199,21 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC return { restrict: 'E', scope: { - pageList: '=', currentPage: '=', lastPage: '=', pageSize: '=', url: '=' }, - templateUrl: 'partials/pagination.html' + templateUrl: 'partials/pagination.html', + link: function (scope, element, attrs) { + //set pageList + scope.pageList = []; + scope.$watch('lastPage', function (newVal) { + for (var i = 0; i <= newVal; i++) { + scope.pageList.push(i); + } + }); + } } }) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index ffa175d..0a9165d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -458,6 +458,7 @@ angular.module('pollControllers', []) }) $scope.tab = $scope.setTab('comment'); + $scope.comment = {text:''}; if (angular.isDefined($scope.session.user)) { @@ -469,8 +470,22 @@ angular.module('pollControllers', []) } } - PollComment.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { + $scope.pageSize = 3; + $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); + + var paginationParameter = {pageSize:$scope.pageSize}; + if (angular.isDefined($routeParams.page)) { + if (angular.isDefined($routeParams.pageSize)) { + paginationParameter = {pageSize:$routeParams.pageSize}; + $scope.pageSize = $routeParams.pageSize; + } + + paginationParameter.pageNumber = $routeParams.page; + } + + PollComment.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, paginationParameter:paginationParameter}, function (data) { $scope.data.comments = data.elements; + $scope.data.commentsPagination = data.pagination; }); $scope.postComment = function () { @@ -486,6 +501,8 @@ angular.module('pollControllers', []) //clean form $scope.comment.text = ''; delete $scope.comment.postDate; + delete $scope.comment.id; + delete $scope.comment.permission; }, function (error) { $scope.restError = error.data; }); @@ -542,23 +559,20 @@ angular.module('pollControllers', []) function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); - $scope.pageSize = 10; + $scope.pageSize = 3; + $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); - var pollPromise; - var paginationParameter; + var paginationParameter = {pageSize:$scope.pageSize}; if (angular.isDefined($routeParams.page)) { if (angular.isDefined($routeParams.pageSize)) { paginationParameter = {pageSize:$routeParams.pageSize}; $scope.pageSize = $routeParams.pageSize; } - else { - paginationParameter = {pageSize:$scope.pageSize}; - } paginationParameter.pageNumber = $routeParams.page; } - + var pollPromise; if (angular.isDefined($routeParams.cmd)) { pollPromise = Poll.get({cmd:$routeParams.cmd, paginationParameter:paginationParameter}).$promise; } @@ -569,16 +583,10 @@ angular.module('pollControllers', []) pollPromise.then(function (data) { $scope.data.polls = data.elements $scope.data.pollsPagination = data.pagination; - $scope.pageList = []; - for (var i = 0; i <= $scope.data.pollsPagination.lastPage; i++) { - $scope.pageList.push(i); - } }, function (error) { $scope.restError = {forbidden:true}; }); - $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); - }]) ; \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html index 90d24ec..2dd295d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -61,9 +61,8 @@ </table>  - <make-pagination page-list="pageList" - current-page="data.pollsPagination.currentPage" - last-page="data.pollsPagination.lastPage" + <make-pagination current-page="data.commentsPagination.currentPage" + last-page="data.commentsPagination.lastPage" page-size="pageSize" url="urlPagination"></make-pagination> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index b648f14..e1f74d8 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -7,8 +7,7 @@ <hr/> </div> -<make-pagination page-list="pageList" - current-page="data.pollsPagination.currentPage" +<make-pagination current-page="data.pollsPagination.currentPage" last-page="data.pollsPagination.lastPage" page-size="pageSize" url="urlPagination"></make-pagination> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0