Author: solomax
Date: Wed Aug 20 11:08:32 2014
New Revision: 1619073
URL: http://svn.apache.org/r1619073
Log:
[OPENMEETINGS-1059] language is loaded from profile
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1619073&r1=1619072&r2=1619073&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java
Wed Aug 20 11:08:32 2014
@@ -95,6 +95,12 @@ public class UserForm extends AdminBaseF
}
@Override
+ protected void onModelChanged() {
+ super.onModelChanged();
+ generalForm.updateModelObject(getModelObject());
+ }
+
+ @Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
User u = getModelObject();
try {
@@ -134,7 +140,7 @@ public class UserForm extends AdminBaseF
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
UserDao usersDaoImpl = getBean(UserDao.class);
- usersDaoImpl.delete(this.getModelObject(), getUserId());
+ usersDaoImpl.delete(getModelObject(), getUserId());
setModelObject(usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId())));
update(target);
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1619073&r1=1619072&r2=1619073&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java
Wed Aug 20 11:08:32 2014
@@ -66,7 +66,7 @@ import com.vaynberg.wicket.select2.Selec
import com.vaynberg.wicket.select2.TextChoiceProvider;
public class GeneralUserForm extends Form<User> {
- private static final long serialVersionUID = 5360667099083510234L;
+ private static final long serialVersionUID = 1L;
private Salutation salutation;
private FieldLanguage lang;
private PasswordTextField passwordField;
@@ -80,16 +80,15 @@ public class GeneralUserForm extends For
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
passwordField.setRequired(false).add(minimumLength(getMinPasswdLength(cfgDao)));
+ updateModelObject(getModelObject());
SalutationDao salutDao = getBean(SalutationDao.class);
FieldLanguageDao langDao = getBean(FieldLanguageDao.class);
- salutation = salutDao.get(getModelObject().getSalutations_id(),
getLanguage());
- lang =
langDao.getFieldLanguageById(getModelObject().getLanguage_id());
add(new DropDownChoice<Salutation>("salutation"
, new PropertyModel<Salutation>(this,
"salutation")
, salutDao.getUserSalutations(getLanguage())
, new ChoiceRenderer<Salutation>("label.value",
"salutations_id"))
.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
-6748844721645465468L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget
target) {
@@ -106,7 +105,7 @@ public class GeneralUserForm extends For
, langDao.getLanguages()
, new ChoiceRenderer<FieldLanguage>("name",
"language_id"))
.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
2072021284702632856L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget
target) {
@@ -187,6 +186,11 @@ public class GeneralUserForm extends For
}).setEnabled(isAdminForm));
}
+ public void updateModelObject(User u) {
+ salutation =
getBean(SalutationDao.class).get(u.getSalutations_id(), getLanguage());
+ lang =
getBean(FieldLanguageDao.class).getFieldLanguageById(u.getLanguage_id());
+ }
+
@Override
protected void onValidate() {
if(!getBean(UserDao.class).checkUserEMail(email.getConvertedInput(),
getModelObject().getUser_id())) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1619073&r1=1619072&r2=1619073&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
Wed Aug 20 11:08:32 2014
@@ -95,6 +95,12 @@ public class UserForm extends AdminBaseF
}
@Override
+ protected void onModelChanged() {
+ super.onModelChanged();
+ generalForm.updateModel(getModelObject());
+ }
+
+ @Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
User u = getModelObject();
try {
@@ -134,8 +140,8 @@ public class UserForm extends AdminBaseF
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
UserDao usersDaoImpl = getBean(UserDao.class);
- usersDaoImpl.delete(this.getModelObject(), getUserId());
-
this.setModelObject(usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId())));
+ usersDaoImpl.delete(getModelObject(), getUserId());
+
setModelObject(usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId())));
update(target);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1619073&r1=1619072&r2=1619073&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
Wed Aug 20 11:08:32 2014
@@ -80,10 +80,9 @@ public class GeneralUserForm extends For
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
passwordField.setRequired(false).add(minimumLength(getMinPasswdLength(cfgDao)));
+ updateModelObject(getModelObject());
SalutationDao salutDao = getBean(SalutationDao.class);
FieldLanguageDao langDao = getBean(FieldLanguageDao.class);
- salutation = salutDao.get(getModelObject().getSalutations_id(),
getLanguage());
- lang =
langDao.getFieldLanguageById(getModelObject().getLanguage_id());
add(new DropDownChoice<Salutation>("salutation"
, new PropertyModel<Salutation>(this,
"salutation")
, salutDao.getUserSalutations(getLanguage())
@@ -187,6 +186,11 @@ public class GeneralUserForm extends For
}).setEnabled(isAdminForm));
}
+ public void updateModelObject(User u) {
+ salutation =
getBean(SalutationDao.class).get(u.getSalutations_id(), getLanguage());
+ lang =
getBean(FieldLanguageDao.class).getFieldLanguageById(u.getLanguage_id());
+ }
+
@Override
protected void onValidate() {
if(!getBean(UserDao.class).checkUserEMail(email.getConvertedInput(),
getModelObject().getId())) {
