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 2016/12/19 14:33:33 UTC
svn commit: r1775110 - in /openmeetings/application:
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/
trunk/openmeetings-web/...
Author: solomax
Date: Mon Dec 19 14:33:32 2016
New Revision: 1775110
URL: http://svn.apache.org/viewvc?rev=1775110&view=rev
Log:
[OPENMEETINGS-1521] user object is properly updated after self-update
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java?rev=1775110&r1=1775109&r2=1775110&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java Mon Dec 19 14:33:32 2016
@@ -44,20 +44,29 @@ public class ProfileForm extends Form<Us
public ProfileForm(String id) {
super(id, new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId())));
-
+
add(feedback.setOutputMarkupId(true));
add(new FormSaveRefreshPanel<User>("buttons", this) {
private static final long serialVersionUID = 1L;
+ private void refreshUser() {
+ User u = getModelObject();
+ if (u.getId() != null) {
+ u = getBean(UserDao.class).get(u.getId());
+ } else {
+ u = new User();
+ }
+ setModelObject(u);
+ }
+
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- User u = getModelObject();
try {
- u = getBean(UserDao.class).update(u, userForm.getPasswordField().getConvertedInput(), getUserId());
+ getBean(UserDao.class).update(getModelObject(), userForm.getPasswordField().getConvertedInput(), getUserId());
} catch (Exception e) {
error(e.getMessage());
}
- setModelObject(u);
+ refreshUser();
target.add(ProfileForm.this);
}
@@ -68,13 +77,7 @@ public class ProfileForm extends Form<Us
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
- User user = getModelObject();
- if (user.getId() != null) {
- user = getBean(UserDao.class).get(user.getId());
- } else {
- user = new User();
- }
- setModelObject(user);
+ refreshUser();
target.add(ProfileForm.this);
}
@@ -91,7 +94,7 @@ public class ProfileForm extends Form<Us
// event and throttle it down to once per second
add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
-
+
@Override
protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
return new PanelMarkupSourcingStrategy(false);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java?rev=1775110&r1=1775109&r2=1775110&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java Mon Dec 19 14:33:32 2016
@@ -44,20 +44,29 @@ public class ProfileForm extends Form<Us
public ProfileForm(String id) {
super(id, new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId())));
-
+
add(feedback.setOutputMarkupId(true));
add(new FormSaveRefreshPanel<User>("buttons", this) {
private static final long serialVersionUID = 1L;
+ private void refreshUser() {
+ User u = getModelObject();
+ if (u.getId() != null) {
+ u = getBean(UserDao.class).get(u.getId());
+ } else {
+ u = new User();
+ }
+ setModelObject(u);
+ }
+
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- User u = getModelObject();
try {
- u = getBean(UserDao.class).update(u, userForm.getPasswordField().getConvertedInput(), getUserId());
+ getBean(UserDao.class).update(getModelObject(), userForm.getPasswordField().getConvertedInput(), getUserId());
} catch (Exception e) {
error(e.getMessage());
}
- setModelObject(u);
+ refreshUser();
target.add(ProfileForm.this);
}
@@ -68,13 +77,7 @@ public class ProfileForm extends Form<Us
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
- User user = getModelObject();
- if (user.getId() != null) {
- user = getBean(UserDao.class).get(user.getId());
- } else {
- user = new User();
- }
- setModelObject(user);
+ refreshUser();
target.add(ProfileForm.this);
}
@@ -91,7 +94,7 @@ public class ProfileForm extends Form<Us
// event and throttle it down to once per second
add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
-
+
@Override
protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
return new PanelMarkupSourcingStrategy(false);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java?rev=1775110&r1=1775109&r2=1775110&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java Mon Dec 19 14:33:32 2016
@@ -44,20 +44,29 @@ public class ProfileForm extends Form<Us
public ProfileForm(String id) {
super(id, new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId())));
-
+
add(feedback.setOutputMarkupId(true));
add(new FormSaveRefreshPanel<User>("buttons", this) {
private static final long serialVersionUID = 1L;
+ private void refreshUser() {
+ User u = getModelObject();
+ if (u.getId() != null) {
+ u = getBean(UserDao.class).get(u.getId());
+ } else {
+ u = new User();
+ }
+ setModelObject(u);
+ }
+
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- User u = getModelObject();
try {
- u = getBean(UserDao.class).update(u, userForm.getPasswordField().getConvertedInput(), getUserId());
+ getBean(UserDao.class).update(getModelObject(), userForm.getPasswordField().getConvertedInput(), getUserId());
} catch (Exception e) {
error(e.getMessage());
}
- setModelObject(u);
+ refreshUser();
target.add(ProfileForm.this);
}
@@ -68,13 +77,7 @@ public class ProfileForm extends Form<Us
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
- User user = getModelObject();
- if (user.getId() != null) {
- user = getBean(UserDao.class).get(user.getId());
- } else {
- user = new User();
- }
- setModelObject(user);
+ refreshUser();
target.add(ProfileForm.this);
}
@@ -91,7 +94,7 @@ public class ProfileForm extends Form<Us
// event and throttle it down to once per second
add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
-
+
@Override
protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
return new PanelMarkupSourcingStrategy(false);