Author: vdegtyarev Date: Thu Aug 22 07:49:28 2013 New Revision: 1516382 URL: http://svn.apache.org/r1516382 Log: OPENMEETINGS-768 minor changes.
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1516382&r1=1516381&r2=1516382&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original) +++ openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Thu Aug 22 07:49:28 2013 @@ -286,7 +286,6 @@ </netRemoteCallHib> <netRemoteCallHib name="getPublicSID" funcname="getPublicSID" > - <netparam><method name="getValue"> return canvas.wicketsid;</method></netparam> <handler name="ondata" args="value"> //The onResult-Handler will be called be the rtmpconnection if ($debug) Debug.write("hibRtmpConnection/getPublicSID [",value,"]"); @@ -792,7 +791,10 @@ canvas.setAttribute('picture_uri',''); canvas.setAttribute('language',''); canvas.setAttribute('currentuser',value.login); - canvas.becomemoderator = value.level_id >= 2; + if (value.timeZoneId != null) { + canvas.timeZoneId = value.timeZoneId; + } + canvas.becomemoderator = value.level_id >= 2; if (value.sessionData == null) { if ($debug) Debug.write("No Language Found to assign"); return; Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx?rev=1516382&r1=1516381&r2=1516382&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx (original) +++ openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx Thu Aug 22 07:49:28 2013 @@ -123,6 +123,8 @@ var tUserName = "<u><FONT color='#0000CC'><a href='asfunction:_root.searchUsers,"+ this.removeWhitespace(obj.firstname) +"'>" + this.removeWhitespace(obj.firstname) + "</a></FONT></u>"; tUserName += " <u><FONT color='#0000CC'><a href='asfunction:_root.searchUsers,"+ this.removeWhitespace(obj.lastname) +"'>" + this.removeWhitespace(obj.lastname) + "</a></FONT></u>"; + + this.timezone.setAttribute("text",this.userObject.timeZoneId); this.username.setAttribute("text",tUserName); Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1516382&r1=1516381&r2=1516382&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Thu Aug 22 07:49:28 2013 @@ -458,7 +458,7 @@ public class ScopeApplicationAdapter ext * * @return publicSID of current client */ - public synchronized String getPublicSID(String wicketSid) { + public synchronized String getPublicSID() { log.debug("----------- getPublicSID"); IConnection current = Red5.getConnectionLocal(); Client currentClient = this.sessionManager