Revision: 4247
Author: solomax666
Date: Fri Sep 16 08:55:02 2011
Log: - Fixes issue 1510 (can't support multi-language well)
- code clean up
http://code.google.com/p/openmeetings/source/detail?r=4247
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
Fri Sep 16 08:55:02 2011
@@ -200,8 +200,6 @@
log.debug("Language requieres RTL!");
List<Map<String, Object>> returnRtlList = new LinkedList<Map<String,
Object>>();
- // List<Fieldlanguagesvalues> returnRtlList =
new
- // LinkedList<Fieldlanguagesvalues>();
for (Iterator<Map<String, Object>> iter =
returnList.iterator(); iter
.hasNext();) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Sep 4 08:07:56 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Fri Sep 16 08:55:02 2011
@@ -1349,6 +1349,7 @@
savedUser.setTitle_id(Integer.parseInt(values.get(
"title_id").toString()));
+
savedUser.setLanguage_id(Long.parseLong(values.get("languages_id").toString()));
savedUser.setOmTimeZone(omTimeZoneDaoImpl
.getOmTimeZone((values.get("jnameTimeZone")
.toString())));
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Wed Sep 7 11:46:30 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Fri Sep 16 08:55:02 2011
@@ -764,20 +764,8 @@
*/
public Long registerUserByObject(Object regObjectObj) {
try {
- @SuppressWarnings("rawtypes")
- Map regObject = (Map) regObjectObj;
- // regObject.get("Username").toString();
- // regObject.get("Userpass").toString();
- // regObject.get("lastname").toString();
- // regObject.get("firstname").toString();
- // regObject.get("email").toString();
- // new Date();regObject.get("street").toString();
- // regObject.get("additionalname").toString();
- // regObject.get("fax").toString();
- // regObject.get("zip").toString();
- //
Long.valueOf(regObject.get("states_id").toString()).longValue();
- // regObject.get("town").toString();
- //
Long.valueOf(regObject.get("language_id").toString()).longValue();
+ @SuppressWarnings("unchecked")
+ Map<?, ?> regObject = (Map<Object, Object>)
regObjectObj;
String domain = regObject.get("domain").toString();
String port = regObject.get("port").toString();
@@ -789,10 +777,6 @@
} else if (port.equals("443")) {
baseURL = "https://"; + domain + webapp;
}
-
- // else if (port.equals("8443")) {
- // baseURL = "https://"+domain+":"+port+"/"+webapp+"/";;
- // }
return
userManagement.registerUser(regObject.get("Username")
.toString(),
regObject.get("Userpass").toString(),
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Wed Sep 7 11:46:30 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Fri Sep 16 08:55:02 2011
@@ -332,33 +332,18 @@
argObjectMap.get("user_idClient").toString())
.longValue();
}
- // log.error("saveOrUpdateUser1: ");
Long users_id = sessionManagement.checkSession(SID);
- // log.error("saveOrUpdateUser2: ");
Long user_level =
userManagement.getUserLevelByID(users_id);
- // log.error("saveOrUpdateUser1:
"+argObjectMap.get("organisations"));
- //
log.error("saveOrUpdateUser2: "+argObjectMap.get("organisations").getClass());
- // log.error("saveOrUpdateUser3:
"+argObjectMap.get("user_idClient"));
- // TODO: there is a BUG here: value send is Time as GMT
but here it
- // gets CEST which is wrong
- // but maybe a OS-related-issue
- // log.error("saveOrUpdateUser4:
"+argObjectMap.get("userage"));
- //
log.error("saveOrUpdateUser5: "+argObjectMap.get("userage").getClass());
-
List organisations = (List)
argObjectMap.get("organisations");
Date age = null;
if (argObjectMap.get("userage") instanceof Date) {
age = (Date) argObjectMap.get("userage");
- // log.debug("saveOrUpdateUser7 TimezoneOffset:
" +
- // age.getTimezoneOffset());
}
log.debug("Mail : " +
argObjectMap.get("email").toString());
log.debug("Phone : " +
argObjectMap.get("phone").toString());
- // log.error("saveOrUpdateUser6: "+age);
-
if (user_idClient == null || user_idClient == 0) {
return userManagement.registerUserInit(
user_level,
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
