Author: sebawagner
Date: Sat Sep 8 11:53:27 2012
New Revision: 1382288
URL: http://svn.apache.org/viewvc?rev=1382288&view=rev
Log:
OPENMEETINGS-428 Refactor User administration to Wicket - couple of fields,
refactor user object to have salutation object and correct naming
Added:
incubator/openmeetings/trunk/singlewebapp/log/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/userContacts.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
Sat Sep 8 11:53:27 2012
@@ -148,7 +148,7 @@
this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
this.adress_comment.setAttribute('text',obj.adresses.comment);
this.status.selectItem(String(obj.status));
- this.salutation.selectItem(String(obj.title_id));
+ this.salutation.selectItem(String(obj.salutations_id));
this._timeZone.selectItem(String(obj.omTimeZone.jname));
this.languages.selectItem(String(obj.language_id));
@@ -267,7 +267,7 @@
this.sendObject["availible"] = 0;
this.sendObject["status"] =
Number(this.parent.status.getValue());
this.sendObject["level_id"] =
Number(this.parent.level.getValue());
- this.sendObject["title_id"] =
Number(this.parent.salutation.getValue());
+ this.sendObject["salutations_id"] =
Number(this.parent.salutation.getValue());
this.sendObject["jNameTimeZone"] =
parent._timeZone.getValue();
this.sendObject["language_id"] = parent.languages.getValue();
this.sendObject["forceTimeZoneCheck"] =
parent.forceTimeZoneCheck.getValue();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
Sat Sep 8 11:53:27 2012
@@ -75,7 +75,7 @@
this.town.setAttribute('text',obj.adresses.town);
this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
this.adress_comment.setAttribute('text',obj.adresses.comment);
- this.salutation.selectItem(String(obj.title_id));
+ this.salutation.selectItem(String(obj.salutations_id));
this._timeZone.selectItem(String(obj.omTimeZone.jname));
this.languages.selectItem(String(obj.language_id));
this._organisationslist.clearList();
@@ -163,7 +163,7 @@
this.parent.userObj.state_id =
this.parent.state.getValue();
this.parent.userObj.comment =
this.parent.adress_comment.getText();
this.parent.userObj.age = this.parent.age.getDate();
- this.parent.userObj.title_id =
Number(this.parent.salutation.getValue());
+ this.parent.userObj.salutations_id =
Number(this.parent.salutation.getValue());
this.parent.userObj.jnameTimeZone =
parent._timeZone.getValue();
this.parent.userObj.languages_id =
parent.languages.getValue();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
Sat Sep 8 11:53:27 2012
@@ -185,7 +185,7 @@
for (var t=0;t<value.result.length;t++)
{
value.result[t]["pending"] =
false;
for (var
i=0;i<canvas.salutationsInitValues.length;i++){
- if
(canvas.salutationsInitValues[i].salutations_id == value.result[t].title_id) {
+ if
(canvas.salutationsInitValues[i].salutations_id ==
value.result[t].salutations_id) {
value.result[t]["title"] = canvas.salutationsInitValues[i].label.value;
break;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/userContacts.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/userContacts.lzx?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/userContacts.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/userContacts.lzx
Sat Sep 8 11:53:27 2012
@@ -69,7 +69,7 @@
var tResult = new Array();
for (var t=0;t<value.length;t++) {
for (var
i=0;i<canvas.salutationsInitValues.length;i++){
- if
(canvas.salutationsInitValues[i].salutations_id == value[t].owner.title_id) {
+ if
(canvas.salutationsInitValues[i].salutations_id ==
value[t].owner.salutations_id) {
value[t].owner["title"]
= canvas.salutationsInitValues[i].label.value;
break;
}
@@ -302,7 +302,7 @@
value[t].contact["pending"] =
value[t].pending;
value[t].contact["userContactId"] = value[t].userContactId;
for (var
i=0;i<canvas.salutationsInitValues.length;i++){
- if
(canvas.salutationsInitValues[i].salutations_id == value[t].contact.title_id) {
+ if
(canvas.salutationsInitValues[i].salutations_id ==
value[t].contact.salutations_id) {
value[t].contact["title"] = canvas.salutationsInitValues[i].label.value;
break;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
Sat Sep 8 11:53:27 2012
@@ -467,7 +467,7 @@ public class Usermanagement {
Date age, String street, String additionalname, String
zip,
long states_id, String town, Long language_id, int
availible,
String telefon, String fax, String mobil, String email,
- String comment, int status, List<Long> organisations,
int title_id,
+ String comment, int status, List<Long> organisations,
int salutations_id,
String phone, boolean sendSMS, String sip_user, String
sip_pass, String sip_auth,
Boolean generateSipUserData, String jNameTimeZone,
Boolean forceTimeZoneCheck, String userOffers, String
userSearchs,
@@ -519,7 +519,7 @@ public class Usermanagement {
us.setUpdatetime(new Date());
us.setAvailible(availible);
us.setStatus(status);
- us.setTitle_id(title_id);
+ us.setSalutations_id(salutations_id);
us.setOmTimeZone(omTimeZoneDaoImpl
.getOmTimeZone(jNameTimeZone));
us.setLanguage_id(language_id);
@@ -1116,7 +1116,7 @@ public class Usermanagement {
users.setLasttrans(new Long(0));
users.setLevel_id(level_id);
users.setStatus(status);
- users.setTitle_id(new Integer(1));
+ users.setSalutations_id(new Integer(1));
users.setStarttime(new Date());
users.setActivatehash(hash);
users.setOmTimeZone(timezone);
@@ -1231,7 +1231,7 @@ public class Usermanagement {
users.setLasttrans(new Long(0));
users.setLevel_id(level_id);
users.setStatus(status);
- users.setTitle_id(new Integer(1));
+ users.setSalutations_id(new Integer(1));
users.setStarttime(new Date());
users.setActivatehash(hash);
users.setPictureuri(pictureuri);
@@ -1364,8 +1364,8 @@ public class Usermanagement {
savedUser.setAge((Date)
values.get("age"));
savedUser.setFirstname(values.get("firstname").toString());
savedUser.setLastname(values.get("lastname").toString());
-
savedUser.setTitle_id(Integer.parseInt(values.get(
-
"title_id").toString()));
+
savedUser.setSalutations_id(Integer.parseInt(values.get(
+
"salutations_id").toString()));
savedUser.setLanguage_id(Long.parseLong(values.get(
"languages_id").toString()));
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
Sat Sep 8 11:53:27 2012
@@ -109,9 +109,15 @@ public class Users implements Serializab
@Element(data=true, required=false)
private Integer status;
- @Column(name = "title_id")
+ //for backward compatibility, delete when AS3/Flash is gone
+ @Column(name = "salutations_id")
@Element(data=true, required=false)
- private Integer title_id;
+ private Long salutations_id;
+
+ @ManyToOne(fetch = FetchType.EAGER)
+ @JoinColumn(name = "salutations_id", insertable = false, updatable =
false)
+ @Element(data=true, required=false)
+ private Salutations salutations;
@Column(name = "starttime")
private Date starttime;
@@ -348,12 +354,20 @@ public class Users implements Serializab
this.status = status;
}
- public Integer getTitle_id() {
- return title_id;
+ public Long getSalutations_id() {
+ return salutations_id;
+ }
+
+ public void setSalutations_id(Long salutations_id) {
+ this.salutations_id = salutations_id;
+ }
+
+ public Salutations getSalutations() {
+ return salutations;
}
- public void setTitle_id(Integer title_id) {
- this.title_id = title_id;
+ public void setSalutations(Salutations salutations) {
+ this.salutations = salutations;
}
public Userlevel getUserlevel() {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
Sat Sep 8 11:53:27 2012
@@ -460,7 +460,7 @@ public class UserService {
.intValue(),
orgIds,
Integer.valueOf(
-
argObjectMap.get("title_id").toString())
+
argObjectMap.get("salutations_id").toString())
.intValue(),
argObjectMap.get("phone").toString(),
Boolean.valueOf(
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
Sat Sep 8 11:53:27 2012
@@ -96,8 +96,17 @@ public class UserImport {
.intValue());
us.setRegdate(CalendarPatterns.parseDate(itemUsers.element(
"regdate").getText()));
- us.setTitle_id(Integer.valueOf(
-
itemUsers.element("title_id").getText()).intValue());
+
+ if (itemUsers.element("salutations_id") != null) {
+ us.setSalutations_id(Integer.valueOf(
+
itemUsers.element("salutations_id").getText()).intValue());
+ }
+ //For being backward compatible we also try to import
the title_id
+ if (itemUsers.element("title_id") != null) {
+ us.setSalutations_id(Integer.valueOf(
+
itemUsers.element("title_id").getText()).intValue());
+ }
+
us.setLevel_id(Long
.valueOf(itemUsers.element("level_id").getText())
.longValue());
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
Sat Sep 8 11:53:27 2012
@@ -268,7 +268,7 @@ public class Export extends HttpServlet
user.addElement("regdate").setText(
CalendarPatterns.getDateWithTimeByMiliSeconds(u
.getRegdate()));
-
user.addElement("title_id").setText(u.getTitle_id().toString());
+
user.addElement("salutations_id").setText(u.getSalutations_id().toString());
user.addElement("level_id").setText(u.getLevel_id().toString());
user.addElement("additionalname").setText(
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
Sat Sep 8 11:53:27 2012
@@ -2,12 +2,21 @@ package org.openmeetings.web.components.
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
+import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
+import org.openmeetings.app.data.user.Salutationmanagement;
+import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
+import org.openmeetings.app.persistence.beans.user.Salutations;
import org.openmeetings.app.persistence.beans.user.Users;
+import org.openmeetings.web.app.Application;
+import org.openmeetings.web.app.WebSession;
public class UserForm extends Form<Users> {
+
public UserForm(String id, Users user) {
super(id, new CompoundPropertyModel<Users>(user));
@@ -15,6 +24,18 @@ public class UserForm extends Form<Users
add(new TextField<String>("login"));
+
+ add(new DropDownChoice<Salutations>("salutations",
+
Application.getBean(Salutationmanagement.class).getUserSalutations(WebSession.getLanguage()),
+ new ChoiceRenderer<Salutations>("label.value",
"salutations_id")));
+
+ add(new TextField<String>("firstname"));
+
+ add(new DropDownChoice<OmTimeZone>("omTimeZone",
+
Application.getBean(OmTimeZoneDaoImpl.class).getOmTimeZones(),
+ new ChoiceRenderer<OmTimeZone>("frontEndLabel",
"jname")));
+
+
//add(new SimpleFormComponentLabel("login-label", fc));
// add a button that can be used to submit the form via ajax
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html?rev=1382288&r1=1382287&r2=1382288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html
Sat Sep 8 11:53:27 2012
@@ -46,6 +46,11 @@
<form wicket:id="form">
<wicket:ommessage key="132" />: <input
type="text" wicket:id="login"/>
<br/>
+ <wicket:ommessage key="133" />: <input
type="password" />
+ <br/>
+ <wicket:ommessage key="135" />: <select
wicket:id="salutations"/> <input type="text" wicket:id="firstname"/>
+ <br/>
+ <wicket:ommessage key="1143" />: <select
wicket:id="omTimeZone"/>
<br/>
<input type="submit" value="submit via
ajax" wicket:id="ajax-button"/>
</form>
