You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/01/22 04:26:36 UTC
svn commit: r1726139 - in
/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf:
base/ base/hibernate/ modules/conference/conference/
modules/conference/interviewuserlist/ modules/conference/participants/
modules/invitation/
Author: solomax
Date: Fri Jan 22 03:26:36 2016
New Revision: 1726139
URL: http://svn.apache.org/viewvc?rev=1726139&view=rev
Log:
[OPENMEETINGS-794] email is displayed as expected in all room if no first/last name is provided
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1726139&r1=1726138&r2=1726139&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Fri Jan 22 03:26:36 2016
@@ -449,12 +449,12 @@
if ($debug) Debug.write("getCurrentRoomClient: ", value);
if (value != null) {
canvas.currentClient = value;
- canvas.setAttribute('currentuser',value.firstname+" "+value.lastname);
+ canvas.setAttribute('currentuser', value.firstname+" "+value.lastname);
//Somehow this leads to a bug in the implementation of the secure User Login
- canvas.setAttribute('userId',value.userId);
+ canvas.setAttribute('userId', value.userId);
- canvas.setAttribute('allowRecording',value.allowRecording);
+ canvas.setAttribute('allowRecording', value.allowRecording);
var fName = value.firstname == null ? "" : value.firstname;
var lName = value.lastname == null ? "" : value.lastname;
@@ -462,8 +462,8 @@
canvas.setAttribute('lastName', lName);
canvas.setAttribute('mail', value.email);
- if (canvas.isRemoteUser() && fName == '' && lName == '') {
- if ($debug) Debug.write("!!!!!!!!!!! Nickname HIB ", value.address.email);
+ if (canvas.isRemoteUser() && !fName && !lName) {
+ if ($debug) Debug.write("!!!!!!!!!!! Nickname HIB ", value.email);
new lz.chooseNickName(canvas);
}
hib.userobject.id = value.userId;
@@ -947,7 +947,9 @@
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write(" onResult setNewBroadCastingFlag : ", value);
var u = canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID);
- u.update(value);
+ if (u != null) {
+ u.update(value);
+ }
if (canvas.publicSID == value.publicSID) {
canvas.commonVideoViewContent.toggleVideo(value.canVideo);
canvas.setAttribute("isBroadCasting", value.isBroadcasting);
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1726139&r1=1726138&r2=1726139&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Fri Jan 22 03:26:36 2016
@@ -510,9 +510,11 @@
for (var i = 0; i < canvas.currentModeratorList.length; ++i) {
var item = canvas.currentModeratorList[i];
var u = canvas._videocontainer._participants.getUserListItemByPublicSID(item.publicSID);
- u.update(item);
- if (canvas.publicSID == item.publicSID) {
- isCurrentModerator = true;
+ if (u != null) {
+ u.update(item);
+ if (canvas.publicSID == item.publicSID) {
+ isCurrentModerator = true;
+ }
}
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx?rev=1726139&r1=1726138&r2=1726139&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx Fri Jan 22 03:26:36 2016
@@ -220,7 +220,7 @@
layout="axis:y;spacing:1" bgcolor="$once{ canvas.getThemeColor('menuBackgroundColor') }" >
<conferencDropDownMenuItem labelid="213" command="cmd_invitation"
- enabled="${ canvas.ismoderator }" />
+ enabled="${ canvas.ismoderator && !hib.currentInvitation }" />
<horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="239" command="cmd_shareDesktop"
enabled="${ canvas._menubar.viewType != 'interview' && canvas.ismoderator }" />
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx?rev=1726139&r1=1726138&r2=1726139&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx Fri Jan 22 03:26:36 2016
@@ -60,6 +60,7 @@
setAttribute('firstname', obj.firstname);
setAttribute('lastname', obj.lastname);
refObj = obj;
+ _userName.setAttribute('text', getUName());
</method>
<method name="updateIconByMod">
@@ -125,8 +126,26 @@
<view name="userStatus" align="right" frame="1"
resource="userstatus_multiframe_rsc" />
- <labelText name="_userName" x="41" y="2"
- text="$once{ (parent.firstname == null ? '' : parent.firstname) + ' ' + (parent.lastname == null ? '' : parent.lastname) }" />
+ <method name="getUName">
+ <![CDATA[
+ var n = "", delim = "";
+ if (!!firstname) {
+ n = firstname;
+ delim = " ";
+ }
+ if (!!lastname) {
+ n += delim + lastname;
+ }
+ if ($debug) Debug.write(" :: getUName :: ", !n, !!refObj, refObj);
+ if (!n && !!refObj && !!refObj.email) {
+ n = refObj.email;
+ }
+ if ($debug) Debug.write(" :: getUName :: ", n);
+ return n;
+ ]]>
+ </method>
+
+ <labelText name="_userName" x="41" y="2" text="$once{ parent.getUName() }" />
<animatorgroup name="showItem" started="false" process="simultaneous">
<animator attribute="height" to="62" duration="750" />
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx?rev=1726139&r1=1726138&r2=1726139&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx Fri Jan 22 03:26:36 2016
@@ -42,7 +42,8 @@
//this._userpic.setAttribute('src',downloadurl);
//This is a workaround cause in LPS-4.2.x immediatelly loading does not work
lz.Timer.addTimer(new LzDelegate(this, "fadeText"), 1000);
-
+
+ checkName();
if (canvas.publicSID == this.refObj.publicSID) {
this._firstName.setAttribute("fontstyle","bold");
this._lastName.setAttribute("fontstyle","bold");
@@ -52,11 +53,23 @@
]]>
</handler>
+ <method name="checkName">
+ <![CDATA[
+ if ($debug) Debug.write("participantListItem::checkName: ", firstname, lastname, !firstname, !lastname, !!refObj, !!refObj.email);
+ if (!firstname && !lastname && !!refObj && !!refObj.email) {
+ if ($debug) Debug.write("participantListItem::oninit: SET FIRST NAME");
+ this.setAttribute('firstname', refObj.email);
+ if ($debug) Debug.write("participantListItem::oninit: ", this._firstName.text);
+ }
+ ]]>
+ </method>
+
<method name="update" args="obj, full=true">
setAttribute('firstname', obj.firstname);
setAttribute('lastname', obj.lastname);
refObj = obj;
this.isMod = refObj.isMod;
+ checkName();
this.updateIcons();
</method>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx?rev=1726139&r1=1726138&r2=1726139&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx Fri Jan 22 03:26:36 2016
@@ -117,10 +117,6 @@
canvas.setAttribute('currentuser', email);
canvas.setAttribute('userId', -invitee.id);
canvas.setAttribute('mail', email);
- if (!invitee.firstname && !invitee.lastname) {
- if ($debug) Debug.write("!!!!!!!!!!! Nickname invitation ", email);
- new lz.chooseNickName(canvas);
- }
canvas.setAttribute('firstName', fName);
canvas.setAttribute('lastName', lName);
canvas.setAttribute('lastLogin', invitee.lastlogin);
@@ -133,6 +129,7 @@
hib.userobject.lastname = lName;
hib.userlang = Number(this.userlang);
+ hib.getCurrentRoomClient.doCall();
this.close();
//if (canvas.language == canvas.thishib.userlang && canvas.thishib.initlanguageLoaded) { TODO canvas.language seems to be dropped
if (canvas.language_id == canvas.thishib.userlang && canvas.thishib.initlanguageLoaded) {