Revision: 4250
Author: solomax666
Date: Sat Sep 17 10:22:51 2011
Log: Fixes Issue 1514 (can't change user's language in administration)
http://code.google.com/p/openmeetings/source/detail?r=4250
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
Mon Sep 12 11:03:36 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
Sat Sep 17 10:22:51 2011
@@ -241,6 +241,7 @@
this.sendObject["level_id"] =
Number(this.parent.level.getValue());
this.sendObject["title_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();
this.sendObject["organisations"] =
this.parent._organisationslist.getAllItems();
@@ -272,7 +273,7 @@
<netparam><method name="getValue">return
parent.sendObject;</method></netparam>
<handler name="ondata" args="val">
<![CDATA[
- //Debug.write("saveOrUpdateUser: ",val);
+ if ($debug) Debug.write("saveOrUpdateUser ondata:
",val);
if (val>0){
var obj = new Array();
obj["user_id"] = val;
@@ -297,10 +298,7 @@
<labelText labelid="133" width="200" y="100" resize="false" x="2"/>
<customEdittext name="userpass1" y="100" password="true" x="120"
width="270" text="" />
- <!--
- <labelText labelid="134" width="200" y="130" resize="false" x="2"/>
- <customEdittext name="userpass2" y="130" password="true" x="120"
width="270" text="" />
- -->
+
<labelText labelid="135" width="200" y="130" resize="false" x="2"/>
<resetCombobox name="salutation" width="100" y="130" x="120"
editable="false" fontsize="11">
<handler name="oninit" >
@@ -372,12 +370,6 @@
<dynamicCombobox name="state" width="270" y="460" x="120"
text="Switzerland" value="204"
/>
- <!--
- <validText name="state" width="270" y="370" x="120"
fontsize="11"
- shownitems="7" validate_method="$once{ canvas.validateCountry
}"
- resultId="state_id" resultName="name" />
- -->
-
<labelText labelid="158" width="200" y="490" resize="false" x="2"/>
<resetCombobox name="status" width="270" y="490" x="120"
editable="false" fontsize="11">
<handler name="oninit" >
@@ -419,9 +411,7 @@
</handler>
<labelTooltip labelid="172" />
</blueButton>
- <!--
- <baseChooseIcon resourceN="edit_add_rsc" labelid="172" y="602" x="400"
- onclick="this.parent.addOrganisationToUser()" /> -->
+
<method name="addOrganisationToUser">
//if (this.user_id!=0)
new
lz.chooseOrganisationWindow(parent,{refObj:this,item_id:this.user_id});
@@ -439,15 +429,6 @@
</method>
<labelTooltip labelid="176" />
</blueButton>
- <!--
- <baseChooseIcon resourceN="button_cancel_rsc" labelid="176" y="602"
x="430"
- onclick="new
lz.confirmDeleteWindow(canvas.main_content._content.inner,{refObj:this});" >
- <method name="confirmDelete">
- if (this.parent._organisationslist._selected!=null)
- for (var i in this.parent._organisationslist._selected)
this.parent._organisationslist.removeItem(this.parent._organisationslist._selected[i].value);
- </method>
- </baseChooseIcon>
- -->
<!-- SIP Account Data -->
<labelText labelid="893" width="200" y="740" resize="false"
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Fri Sep 16 08:55:02 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sat Sep 17 10:22:51 2011
@@ -454,7 +454,7 @@
public Long updateUser(long user_level, Long user_id, Long level_id,
String login, String password, String lastname, String
firstname,
Date age, String street, String additionalname, String
zip,
- long states_id, String town, int availible, String
telefon,
+ long states_id, String town, Long language_id, int availible, String
telefon,
String fax, String mobil, String email, String comment,
int status,
List<?> organisations, int title_id, String phone,
String sip_user,
String sip_pass, String sip_auth, Boolean
generateSipUserData,
@@ -511,6 +511,7 @@
us.setTitle_id(title_id);
us.setOmTimeZone(omTimeZoneDaoImpl
.getOmTimeZone(jNameTimeZone));
+ us.setLanguage_id(language_id);
us.setForceTimeZoneCheck(forceTimeZoneCheck);
us.setUserOffers(userOffers);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Fri Sep 16 08:55:02 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Sat Sep 17 10:22:51 2011
@@ -367,7 +367,7 @@
Long.valueOf(argObjectMap.get("states_id").toString())
.longValue(),
argObjectMap.get("town").toString(),
- 0,
+ new
Long(argObjectMap.get("language_id").toString()),
true,
organisations,
argObjectMap.get("phone").toString(),
@@ -411,6 +411,7 @@
argObjectMap.get("states_id")
.toString()).longValue(),
argObjectMap.get("town").toString(),
+ new
Long(argObjectMap.get("language_id").toString()),
Integer.valueOf(
argObjectMap.get("availible")
.toString()).intValue(),
--
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.
