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 2015/02/24 08:52:23 UTC
svn commit: r1661861 - in
/openmeetings/branches/3.0.x/WebContent/src/modules/conference:
interviewuserlist/ restricted/
Author: solomax
Date: Tue Feb 24 07:52:23 2015
New Revision: 1661861
URL: http://svn.apache.org/r1661861
Log:
[OPENMEETINGS-1182] Last name of Joomla users is not displayed as 'null'
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewListInner.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewListInner.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewListInner.lzx?rev=1661861&r1=1661860&r2=1661861&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewListInner.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewListInner.lzx Tue Feb 24 07:52:23 2015
@@ -57,16 +57,16 @@
return;
}
}
- var lastname = object.lastname;
+ var lastname = object.lastname == null ? "" : object.lastname;
if (object.isSuperModerator) {
lastname += " *";
}
new lz.interviewUserListItem(list,{
user_id:object.user_id,
- firstname:object.firstname,
+ firstname: object.firstname,
isSuperModerator:object.isSuperModerator,
- lastname:lastname,
+ lastname: lastname,
refObj:object,
connectedSince:object.connectedSince,
isMod:object.isMod,
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx?rev=1661861&r1=1661860&r2=1661861&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx Tue Feb 24 07:52:23 2015
@@ -118,7 +118,7 @@
resource="userstatus_multiframe_rsc" />
<labelText name="_userName" x="41" y="2"
- text="$once{ parent.firstname + ' ' + parent.lastname }" />
+ text="$once{ (parent.firstname == null ? '' : parent.firstname) + ' ' + (parent.lastname == null ? '' : parent.lastname) }" />
<animatorgroup name="showItem" started="false" process="simultaneous">
<animator attribute="height" to="62" duration="750" />
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx?rev=1661861&r1=1661860&r2=1661861&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx Tue Feb 24 07:52:23 2015
@@ -30,19 +30,17 @@
this.getClientListScope.doCall();
</handler>
- <netRemoteCallHib name="getClientListScope" funcname="getClientListScope"
- remotecontext="$once{ canvas.thishib }" >
+ <netRemoteCallHib name="getClientListScope" funcname="getClientListScope" remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("+++++++++++++++++ getClientListScope : ",value);
-
- for (var i = 0; i < value.length; ++i) {
- parent._users.addItem(value[i].firstname+','+value[i].lastname+' ['+value[i].username+']',value[i].publicSID);
- }
-
- parent._users.selectItemAt(0);
- ]]>
- </handler>
+ <![CDATA[
+ if ($debug) Debug.write("+++++++++++++++++ getClientListScope : ",value);
+ for (var i = 0; i < value.length; ++i) {
+ var name = (value[i].firstname == null ? "" : value[i].firstname) + ',' + (value[i].lastname == null ? "" : value[i].lastname);
+ parent._users.addItem(name + ' [' + value[i].username + ']', value[i].publicSID);
+ }
+ parent._users.selectItemAt(0);
+ ]]>
+ </handler>
</netRemoteCallHib>
<labelText labelid="911" x="2" y="22"/>
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx?rev=1661861&r1=1661860&r2=1661861&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx Tue Feb 24 07:52:23 2015
@@ -37,6 +37,8 @@
<![CDATA[
if ($debug) Debug.write("restrictedUserListInner::initialAddItem : ",object.publicSID);
+ object.firstname = object.firstname == null ? "" : object.firstname;
+ object.lastname = object.lastname == null ? "" : object.lastname;
if (object.isSuperModerator) {
object.lastname += " *";
}
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx?rev=1661861&r1=1661860&r2=1661861&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx Tue Feb 24 07:52:23 2015
@@ -114,7 +114,7 @@
<view name="_content" width="254">
<view name="_contentIsCurrent" visible="${ parent.parent.selfItem }" width="254" height="40" bgcolor="0x7CFC00"/>
- <labelText name="_userName" x="2" y="2" text="${ parent.parent.firstname+' '+parent.parent.lastname }" />
+ <labelText name="_userName" x="2" y="2" text="${ (parent.parent.firstname == null ? '' : parent.parent.firstname) + ' ' + (parent.parent.lastname == null ? '' : parent.parent.lastname) }" />
<miniIcons name="_restartDevice" x="220" y="0" width="16" height="16" resource="resyncuser_rsc" showhandcursor="true"
visible="${ parent.parent.clickable && parent.parent.selfItem && canvas.isBroadCasting }">