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 2012/12/19 19:27:36 UTC
svn commit: r1424003 -
/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
Author: solomax
Date: Wed Dec 19 18:27:35 2012
New Revision: 1424003
URL: http://svn.apache.org/viewvc?rev=1424003&view=rev
Log:
Wicket: user edit works as expected
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java?rev=1424003&r1=1424002&r2=1424003&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java Wed Dec 19 18:27:35 2012
@@ -168,11 +168,13 @@ public class UserForm extends AdminBaseF
// different mechanism to protect the password from being read
// sebawagner, 01.10.2012
try {
- //FIXME need to be verified
- u.updatePassword(
- Application.getBean(ManageCryptStyle.class)
- , Application.getBean(ConfigurationDao.class)
- , passwordField.getConvertedInput());
+ String pass = passwordField.getConvertedInput();
+ if (pass != null&& !pass.isEmpty()) {
+ u.updatePassword(
+ Application.getBean(ManageCryptStyle.class)
+ , Application.getBean(ConfigurationDao.class)
+ , passwordField.getConvertedInput());
+ }
Application.getBean(UsersDao.class).update(u, WebSession.getUserId());
} catch (Exception e) {
//FIXME update feedback with the error details