Author: solomax
Date: Tue Mar 1 06:47:06 2016
New Revision: 1733001
URL: http://svn.apache.org/viewvc?rev=1733001&view=rev
Log:
[OPENMEETINGS-1340] kick works as expected in conference room
Modified:
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/conference/popups/confirmationSingle.lzx
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=1733001&r1=1733000&r2=1733001&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
Tue Mar 1 06:47:06 2016
@@ -446,13 +446,13 @@
</handler>
- <method name="sendConfirmation" args="yesno" >
+ <method name="sendConfirmation" args="yesno, none" >
this.kickUserByPublicSID.publicSID =
parent.parent.refObj.publicSID;
this.kickUserByPublicSID.doCall();
</method>
- <netRemoteCallHib name="kickUserByPublicSID"
funcname="userservice.kickUserByPublicSID"
- remotecontext="$once{
canvas.thishib }" >
+ <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>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/confirmationSingle.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/confirmationSingle.lzx?rev=1733001&r1=1733000&r2=1733001&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/confirmationSingle.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/confirmationSingle.lzx
Tue Mar 1 06:47:06 2016
@@ -104,6 +104,9 @@
<simpleLabelButton labelid="60" width="100" x="$once{ parent.width - 210
}" y="$once{ parent.height - 26 }">
<handler name="onclick">
var t = parent.holddatainSO.getValue();
+ //if ($debug) Debug.write("t ", t);
+ //if ($debug) Debug.write("parent ", this.parent);
+ //if ($debug) Debug.write("refObj ", this.parent.refObj);
this.parent.close();
if (parent.refReturnMethod == null) {
this.parent.refObj.sendConfirmation(true,t);
