You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/08/08 08:37:22 UTC
svn commit: r1511597 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings:
data/user/dao/UsersDao.java web/admin/users/UserForm.java
Author: solomax
Date: Thu Aug 8 06:37:22 2013
New Revision: 1511597
URL: http://svn.apache.org/r1511597
Log:
[OPENMEETINGS-741] User model with the password is not returned
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1511597&r1=1511596&r2=1511597&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java Thu Aug 8 06:37:22 2013
@@ -139,12 +139,17 @@ public class UsersDao implements IDataPr
return u;
}
+ // TODO: Why the password field is not set via the Model is because its
+ // FetchType is Lazy, this extra hook here might be not needed with a
+ // different mechanism to protect the password from being read
+ // sebawagner, 01.10.2012
public User update(User user, String password, long updatedBy) throws NoSuchAlgorithmException {
User u = update(user, updatedBy);
if (password != null && !password.isEmpty()) {
- u = get(u.getUser_id(), true);
- u.updatePassword(cryptManager, configurationDao, password);
- u = update(u, updatedBy);
+ //OpenJPA is not allowing to set fields not being fetched before
+ User u1 = get(u.getUser_id(), true);
+ u1.updatePassword(cryptManager, configurationDao, password);
+ update(u1, updatedBy);
}
return u;
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1511597&r1=1511596&r2=1511597&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java Thu Aug 8 06:37:22 2013
@@ -77,10 +77,6 @@ public class UserForm extends AdminBaseF
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
User u = getModelObject();
- // TODO: Why the password field is not set via the Model is because its
- // FetchType is Lazy, this extra hook here might be not needed with a
- // different mechanism to protect the password from being read
- // sebawagner, 01.10.2012
try {
u = getBean(UsersDao.class).update(u, generalForm.getPasswordField().getConvertedInput(), getUserId());
} catch (Exception e) {