[openmeetings] branch master updated: [OPENMEETINGS-1852] password of privileged user can be set/changed

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 395353d  [OPENMEETINGS-1852] password of privileged user can be 
set/changed
395353d is described below

commit 395353df4346c5f0a6d46663c7ee98e75b0db9ce
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Mar 16 20:47:12 2018 +0700

    [OPENMEETINGS-1852] password of privileged user can be set/changed
---
 .../org/apache/openmeetings/web/admin/users/PasswordDialog.java   | 2 +-
 .../java/org/apache/openmeetings/web/admin/users/UserForm.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
index 641ed8a..be11434 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
@@ -43,7 +43,7 @@ public class PasswordDialog extends 
AbstractFormDialog<String> {
        private DialogButton cancel;
        protected final KendoFeedbackPanel feedback = new 
KendoFeedbackPanel("feedback", new Options("button", true));
        private final Form<String> form = new Form<>("form");
-       private final PasswordTextField pass = new 
PasswordTextField("password");
+       private final PasswordTextField pass = new 
PasswordTextField("password", Model.of(""));
        private SerializableConsumer<AjaxRequestTarget> action = null;
 
        public PasswordDialog(String id) {
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index e1e6805..d75f759 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -183,10 +183,10 @@ public class UserForm extends AdminBaseForm<User> {
        @Override
        protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
                if (isAdminPassRequired()) {
-                       
adminPass.setAction((SerializableConsumer<AjaxRequestTarget>)t -> saveUser(t));
+                       
adminPass.setAction((SerializableConsumer<AjaxRequestTarget>)t -> saveUser(t, 
password.getModelObject()));
                        adminPass.open(target);
                } else {
-                       saveUser(target);
+                       saveUser(target, password.getConvertedInput());
                }
        }
 
@@ -201,7 +201,7 @@ public class UserForm extends AdminBaseForm<User> {
                return checkLevel(u.getRights()) || (ou != null && 
checkLevel(ou.getRights()));
        }
 
-       void saveUser(AjaxRequestTarget target) {
+       private void saveUser(AjaxRequestTarget target, String pass) {
                User u = getModelObject();
                final UserDao dao = getBean(UserDao.class);
                final boolean isNew = u.getId() == null;
@@ -210,7 +210,7 @@ public class UserForm extends AdminBaseForm<User> {
                        u.setActivatehash(UUID.randomUUID().toString());
                }
                try {
-                       u = dao.update(u, password.getConvertedInput(), 
getUserId());
+                       u = dao.update(u, pass, getUserId());
                } catch (Exception e) {
                        log.error("[onSaveSubmit]: ", e);
                }

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.