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/02/11 07:42:48 UTC
svn commit: r1729767 - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/
branches/3.1.x/openmeetings-flash/src/main/swf/modul...
Author: solomax
Date: Thu Feb 11 06:42:47 2016
New Revision: 1729767
URL: http://svn.apache.org/viewvc?rev=1729767&view=rev
Log:
[OPENMEETINGS-1331] kick by room moderator works as expected
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
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/modules/conference/restricted/moderationMiniIconRestricted.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1729767&r1=1729766&r2=1729767&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java Thu Feb 11 06:42:47 2016
@@ -190,8 +190,7 @@ public class UserService implements IUse
if (rcl.getRoomId() != null) {
scopeName = rcl.getRoomId().toString();
}
- IScope currentScope = this.scopeApplicationAdapter
- .getRoomScope(scopeName);
+ IScope currentScope = scopeApplicationAdapter.getRoomScope(scopeName);
HashMap<Integer, String> messageObj = new HashMap<Integer, String>();
messageObj.put(0, "kick");
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=1729767&r1=1729766&r2=1729767&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 Thu Feb 11 06:42:47 2016
@@ -1233,13 +1233,11 @@
<method name="sendVarsToMessageWithClient" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("sendVarsToMessageWithClient : ",value,value.message,value.message[0]);
- if (value[0]=='kick' || value.message[0]=='kick') {
- //canvas.currentModApply
+ if ($debug) Debug.write("sendVarsToMessageWithClient : ", value,value.message, value.message[0]);
+ if (value[0] == 'kick' || value.message[0] == 'kick') {
if ($debug) Debug.write("!!!!!! THIS USER GOING TO BE KICKED");
- parent.showKickMessage = true;
- parent.disconnect();
- canvas.commonVideoViewContent.immediateExitRoom(true,null);
+ this.showKickMessage = true;
+ this.disconnect();
} else if (value.message[0]=='copiedText'){
//canvas.currentModApply
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx?rev=1729767&r1=1729766&r2=1729767&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx Thu Feb 11 06:42:47 2016
@@ -362,41 +362,34 @@
<labelTooltip labelid="1424" />
</miniIcons>
- <miniIcons name="_kickUser" x="154" width="16" height="16"
- resource="kick_user_rsc" showhandcursor="true">
- <handler name="onclick">
-
- if (parent.parent.parent.refObj.publicSID == canvas.publicSID) {
- new lz.labelerrorPopup(canvas.main_content._content.inner,{
- errorlabelid:1214
- });
+ <miniIcons name="_kickUser" x="154" width="16" height="16" resource="kick_user_rsc" showhandcursor="true">
+ <handler name="onclick">
+ if (parent.parent.parent.refObj.publicSID == canvas.publicSID) {
+ new lz.labelerrorPopup(canvas.main_content._content.inner, {errorlabelid: 1214});
return;
}
-
- if (parent.isSuperModerator) {
- new lz.labelerrorPopup(canvas.main_content._content.inner,{errorlabelid:1217});
- return;
- }
-
- if ($debug) Debug.write("USER Kick: ",parent.parent.parent.refObj.publicSID);
- new lz.confirmationSingle(canvas.main_content._content.inner,{
- labelid:1216,labeliderror:1215,
- refObj:this,showCheckBox:false});
-
- </handler>
+ if (parent.isSuperModerator) {
+ new lz.labelerrorPopup(canvas.main_content._content.inner, {errorlabelid: 1217});
+ return;
+ }
+
+ if ($debug) Debug.write("USER Kick: ", parent.parent.parent.refObj.publicSID);
+ new lz.confirmationSingle(canvas.main_content._content.inner,{
+ labelid: 1216, labeliderror: 1215, refObj: this, showCheckBox: false});
+ </handler>
<method name="sendConfirmation" args="yesno, none" >
this.kickUserByPublicSID.publicSID = parent.parent.parent.refObj.publicSID;
this.kickUserByPublicSID.doCall();
</method>
- <netRemoteCallHib name="kickUserByPublicSID" funcname="userservice.kickUserByPublicSID"
+ <netRemoteCallHib name="kickUserByPublicSID" funcname="userservice.kickUserByPublicSID" showLoading="false"
remotecontext="$once{ canvas.thishib }" >
<attribute name="publicSID" value="" type="string" />
<netparam><method name="getValue"> return canvas.sessionId; </method></netparam>
<netparam><method name="getValue"> return parent.publicSID; </method></netparam>
<handler name="ondata" args="value">
- if ($debug) Debug.write("kickUserByPublicSID: ",value);
+ if ($debug) Debug.warn("!!!! kickUserByPublicSID: ", value);
</handler>
</netRemoteCallHib>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx?rev=1729767&r1=1729766&r2=1729767&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx Thu Feb 11 06:42:47 2016
@@ -209,9 +209,13 @@
requestor.dataFormat = dataFormat;
//Initiate the transaction
- requestor.addEventListener(Event.COMPLETE, successCallback);
- requestor.addEventListener("ioError", errorCallback); //IOErrorEvent.IOERROR
- requestor.addEventListener(SecurityErrorEvent.SECURITY_ERROR, errorCallback);
+ if (!!this.successCallback) {
+ requestor.addEventListener(Event.COMPLETE, successCallback);
+ }
+ if (!!this.errorCallback) {
+ requestor.addEventListener("ioError", errorCallback); //IOErrorEvent.IOERROR
+ requestor.addEventListener(SecurityErrorEvent.SECURITY_ERROR, errorCallback);
+ }
}
public function load(vars):void {
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1729767&r1=1729766&r2=1729767&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java Thu Feb 11 06:42:47 2016
@@ -174,8 +174,7 @@ public class UserService implements IUse
if (rcl.getRoomId() != null) {
scopeName = rcl.getRoomId().toString();
}
- IScope currentScope = this.scopeApplicationAdapter
- .getRoomScope(scopeName);
+ IScope currentScope = scopeApplicationAdapter.getRoomScope(scopeName);
HashMap<Integer, String> messageObj = new HashMap<Integer, String>();
messageObj.put(0, "kick");