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 2014/07/22 16:40:17 UTC
svn commit: r1612581 - in /openmeetings/branches/3.0.x/WebContent/src:
base/hibernate/hibRtmpConnection.lzx
modules/conference/restricted/restrictedUserListInner.lzx
Author: solomax
Date: Tue Jul 22 14:40:17 2014
New Revision: 1612581
URL: http://svn.apache.org/r1612581
Log:
[OPENMEETINGS-1050] sometimes users were not displayed in the list
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
Modified: openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1612581&r1=1612580&r2=1612581&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx Tue Jul 22 14:40:17 2014
@@ -1768,6 +1768,8 @@
<netRemoteCallHib name="roomConnect" funcname="roomConnect" >
<handler name="ondata" args="value">
if ($debug) Debug.write("roomConnect: ",value);
+ canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.username,
+ '',value.formatedDate,value.userpos,value.usercolor,value);
</handler>
</netRemoteCallHib>
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=1612581&r1=1612580&r2=1612581&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 Jul 22 14:40:17 2014
@@ -29,54 +29,48 @@
<attribute name="sortType" value="alphabetical" type="string" />
- <handler name="oninit">
- <![CDATA[
- this.initList();
- ]]>
- </handler>
+ <handler name="oninit">
+ this.initList();
+ </handler>
- <method name="initialAddItem" args="object">
- <![CDATA[
- if ($debug) Debug.write("restrictedUserListInner::initialAddItem : ",object.publicSID);
-
- //Check for duplicates
- if (object.isSuperModerator) {
- object.lastname += " *";
- }
-
- //Add item to list
- if (this._table.renderList == null) {
- this._table.renderList = new Array();
+ <method name="initialAddItem" args="object">
+ <![CDATA[
+ if ($debug) Debug.write("restrictedUserListInner::initialAddItem : ",object.publicSID);
+
+ if (object.isSuperModerator) {
+ object.lastname += " *";
+ }
+
+ //Add item to list
+ if (this._table.renderList == null) {
+ this._table.renderList = new Array();
+ }
+ //Check for duplicates
+ var list = this._table.renderList;
+ for (var i = 0; i < list.length; ++i) {
+ if (list[i].publicSID == object.publicSID) {
+ //if ($debug) Debug.warn("Already on List, do not add twice");
+ return;
}
-
- object.isSelected = false;
- this._table.renderList.push(object);
- ]]>
- </method>
+ }
+
+ object.isSelected = false;
+ this._table.renderList.push(object);
+ ]]>
+ </method>
- <method name="addItem" args="object">
- <![CDATA[
- if ($debug) Debug.write("restrictedUserListInner::addItem: ",object.publicSID);
-
- //Check for duplicates
- if (object.isSuperModerator) {
- object.lastname += " *";
- }
-
- object.selfItem = false;
- //Add item to list
- if (this._table.renderList == null) {
- this._table.renderList = new Array();
- }
-
- object.isSelected = false;
- this._table.renderList.push(object);
- this.sortUserList();
-
- this._table.scheduleRenderContent();
- this.moderationPanel.updateIcons();
- ]]>
- </method>
+ <method name="addItem" args="object">
+ <![CDATA[
+ initialAddItem(object);
+ if ($debug) Debug.write("restrictedUserListInner::addItem: ", object.publicSID);
+
+ object.selfItem = canvas.publicSID == object.publicSID;
+ this.sortUserList();
+
+ this._table.scheduleRenderContent();
+ this.moderationPanel.updateIcons();
+ ]]>
+ </method>
<method name="sortAndRenderList">
this.sortUserList();