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/26 15:31:36 UTC
svn commit: r1726799 - in /openmeetings/application:
branches/3.1.x/openmeetings-flash/src/main/swf/base/
branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/
branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenc...
Author: solomax
Date: Tue Jan 26 14:31:36 2016
New Revision: 1726799
URL: http://svn.apache.org/viewvc?rev=1726799&view=rev
Log:
[OPENMEETINGS-1317] room for invited user seems to work as expected
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/flexibleConferenceRoom/restrictedConferenceRoom.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/restricted/restrictedUserListItem.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
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=1726799&r1=1726798&r2=1726799&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 Tue Jan 26 14:31:36 2016
@@ -1457,9 +1457,14 @@
<method name="nickNameSet" args="value">
if ($debug) Debug.write("nickNameSet: ", value);
+ canvas.currentClient = value;
canvas.setAttribute('mail', value.email);
canvas.setAttribute('firstName', value.firstname);
canvas.setAttribute('lastName', value.lastname);
+ var v = canvas.commonVideoViewContent.getVideoObjectByPublicSID(value.publicSID);
+ if (v != null) {
+ v.setAttribute('chatpartnername', canvas.currentClient.firstname + ' ' + canvas.currentClient.lastname);
+ }
if (canvas._videocontainer) {
var vo = canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID);
if (vo != null) {
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=1726799&r1=1726798&r2=1726799&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 Tue Jan 26 14:31:36 2016
@@ -496,6 +496,7 @@
-->
<method name="updateModerationFlag">
<![CDATA[
+ var isCurrentModerator = false;
if ($debug) Debug.write("updateModerationFlag", canvas.removeModeratorList);
for (var i = 0; i < canvas.removeModeratorList.length; ++i) {
var item = canvas.removeModeratorList[i];
@@ -505,7 +506,6 @@
u.update(item, false);
}
}
- var isCurrentModerator = false;
if ($debug) Debug.write("updateModerationFlag", canvas.currentModeratorList);
for (var i = 0; i < canvas.currentModeratorList.length; ++i) {
var item = canvas.currentModeratorList[i];
@@ -520,7 +520,11 @@
// do always spread this event, we need to broadcast the "onismoderator" event
// so that we can update the status of other users in the user list
- this.setAttribute('ismoderator', isCurrentModerator);
+ try {
+ canvas.setAttribute('ismoderator', isCurrentModerator);
+ } catch (e:Error) {
+ if ($debug) Debug.error("updateModerationFlag::error ", e);
+ }
]]>
</method>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1726799&r1=1726798&r2=1726799&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx Tue Jan 26 14:31:36 2016
@@ -30,8 +30,8 @@
<view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-(parent._chatPanelStrict.height) -
- ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}" clip="true"
- visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
+ (!parent._chatPanelStrict.visible ? 5 : 28)}" clip="true"
+ visible="${ !canvas.currentRoomObj.hideWhiteboard }">
<view name="_inn" width="${parent.width-10}">
<wrappinglayout axis="x" spacing="10"/>
</view>
@@ -41,7 +41,7 @@
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }"
width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - (parent._chatPanelStrict.height) - ((parent._chatPanelStrict.visibility == 'hidden') ? 0:28) }" />
+ height="${ canvas.height - (parent._chatPanelStrict.height) - (!parent._chatPanelStrict.visible ? 0 : 28) }" />
</class>
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=1726799&r1=1726798&r2=1726799&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 Tue Jan 26 14:31:36 2016
@@ -136,11 +136,11 @@
if (!!lastname) {
n += delim + lastname;
}
- if ($debug) Debug.write(" :: getUName :: ", !n, !!refObj, refObj);
+ //if ($debug) Debug.write(" :: getUName :: ", !n, !!refObj, refObj);
if (!n && !!refObj && !!refObj.email) {
n = refObj.email;
}
- if ($debug) Debug.write(" :: getUName :: ", n);
+ //if ($debug) Debug.write(" :: getUName :: ", n);
return n;
]]>
</method>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx?rev=1726799&r1=1726798&r2=1726799&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx Tue Jan 26 14:31:36 2016
@@ -145,11 +145,11 @@
if (!!lastname) {
n += delim + lastname;
}
- if ($debug) Debug.write(" :: getUName :: ", !n, !!refObj, refObj);
+ //if ($debug) Debug.write(" :: getUName :: ", !n, !!refObj, refObj);
if (!n && !!refObj && !!refObj.email) {
n = refObj.email;
}
- if ($debug) Debug.write(" :: getUName :: ", n);
+ //if ($debug) Debug.write(" :: getUName :: ", n);
return n;
]]>
</method>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1726799&r1=1726798&r2=1726799&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Tue Jan 26 14:31:36 2016
@@ -78,7 +78,7 @@
</class>
<class name="fixedFileExplorerWhiteboardPanel" extends="basePropertyPanelWhiteboard" allowToggle="false"
- labelid="615" visible="${((canvas.currentRoomObj.hideWhiteboard) ? false:true)}">
+ labelid="615" visible="${ !canvas.currentRoomObj.hideWhiteboard }">
<attribute name="whiteboardCount" value="0" type="number" />
<!--
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java?rev=1726799&r1=1726798&r2=1726799&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java Tue Jan 26 14:31:36 2016
@@ -108,7 +108,7 @@ public class ErrorWebService {
if (sid != null && message != null) {
Long userId = sessionDao.checkSession(sid);
if (userId != null && userId != 0) {
- log.debug("[CLIENT MESSAGE] " + message);
+ log.error("[CLIENT MESSAGE] " + message);
}
}
}
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java?rev=1726799&r1=1726798&r2=1726799&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java Tue Jan 26 14:31:36 2016
@@ -108,7 +108,7 @@ public class ErrorWebService {
if (sid != null && message != null) {
Long userId = sessionDao.checkSession(sid);
if (userId != null && userId != 0) {
- log.debug("[CLIENT MESSAGE] " + message);
+ log.error("[CLIENT MESSAGE] " + message);
}
}
}