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 2017/11/15 07:00:34 UTC
openmeetings git commit: [OPENMEETINGS-1756] NickName dialog works as
expected
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x a19875cfb -> d6e4ab3f5
[OPENMEETINGS-1756] NickName dialog works as expected
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d6e4ab3f
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d6e4ab3f
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d6e4ab3f
Branch: refs/heads/4.0.x
Commit: d6e4ab3f5d7e1c91f620b6bd849795651633cf5a
Parents: a19875c
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Nov 15 14:00:26 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Nov 15 14:00:26 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/db/entity/user/User.java | 6 ++++--
.../org/apache/openmeetings/web/room/NicknameDialog.java | 10 +++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d6e4ab3f/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index dd18999..fdb1895 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -343,8 +343,9 @@ public class User extends HistoricalEntity {
return firstname;
}
- public void setFirstname(String firstname) {
+ public User setFirstname(String firstname) {
this.firstname = firstname;
+ return this;
}
public Date getLastlogin() {
@@ -359,8 +360,9 @@ public class User extends HistoricalEntity {
return lastname;
}
- public void setLastname(String lastname) {
+ public User setLastname(String lastname) {
this.lastname = lastname;
+ return this;
}
public String getLogin() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d6e4ab3f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
index 9681cfa..60d0712 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.room;
+import static org.apache.openmeetings.web.app.Application.update;
import static org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.util.Arrays;
@@ -25,6 +26,7 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.time.FastDateFormat;
+import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.util.NonClosableDialog;
@@ -52,8 +54,7 @@ public class NicknameDialog extends NonClosableDialog<User> {
public NicknameDialog(String id, final RoomPanel room) {
super(id, Application.getString("1287"));
this.room = room;
- User u = room.getClient().getUser();
- add(form = new Form<>("form", new CompoundPropertyModel<>(u)));
+ add(form = new Form<>("form", new CompoundPropertyModel<>(room.getClient().getUser())));
}
@Override
@@ -105,6 +106,9 @@ public class NicknameDialog extends NonClosableDialog<User> {
@Override
protected void onSubmit(AjaxRequestTarget target) {
- room.broadcast(room.getClient());
+ final User u = form.getModelObject();
+ final Client c = room.getClient();
+ c.getUser().setFirstname(u.getFirstname()).setLastname(u.getLastname());
+ room.broadcast(update(c));
}
}