Author: solomax
Date: Sat Oct 8 09:17:56 2016
New Revision: 1763879
URL: http://svn.apache.org/viewvc?rev=1763879&view=rev
Log:
[OPENMEETINGS-1484] moderation check works as expected in all rooms
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1763879&r1=1763878&r2=1763879&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
Sat Oct 8 09:17:56 2016
@@ -74,40 +74,38 @@
this.getRoomModeratorsByRoomId.doCall();
}
</method>
-
- <netRemoteCallHib name="getRoomModeratorsByRoomId"
funcname="conferenceservice.getRoomModeratorsByRoomId"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("getRoomModeratorsByRoomId: ",value);
- canvas.becomeSuperModerator = false;
-
- parent.setRoomValues.applyDefaultModeration =
canvas.becomemoderator;
-
- for (var i=0;i<value.length;i++) {
-
- if (value[i].user.userId == canvas.userId) {
- parent.setRoomValues.applyDefaultModeration = true;
- canvas.becomeSuperModerator =
value[i].isSuperModerator;
- if ($debug) Debug.info("Make this User to an
Moderator");
- break;
- }
-
- }
-
- if ($debug) Debug.write("canvas.becomemoderator:
",canvas.becomemoderator);
- if ($debug) Debug.write("canvas.becomeSuperModerator:
",canvas.becomeSuperModerator);
-
- canvas.currentusercolor = canvas.getColorForUser();
-
- if ($debug) Debug.write(hib.userobject);
- this.parent.setRoomValues.doCall();
-
- ]]>
- </handler>
- </netRemoteCallHib>
+
+ <netRemoteCallHib name="getRoomModeratorsByRoomId"
funcname="conferenceservice.getRoomModeratorsByRoomId" remotecontext="$once{
canvas.thishib }" >
+ <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug) Debug.write("getRoomModeratorsByRoomId: ",
canvas.userId, value);
+ canvas.becomeSuperModerator = false;
+
+ parent.setRoomValues.applyDefaultModeration =
canvas.becomemoderator;
+ canvas.becomeSuperModerator = canvas.becomemoderator;
+
+ if (!canvas.becomeSuperModerator) {
+ for (var i = 0; i < value.length; ++i) {
+ if (value[i].user.id == canvas.userId) {
+
parent.setRoomValues.applyDefaultModeration = true;
+ canvas.becomeSuperModerator =
value[i].superModerator;
+ if ($debug) Debug.info("Make
this User to an Moderator");
+ break;
+ }
+ }
+ }
+ if ($debug) Debug.write("canvas.becomemoderator:
",canvas.becomemoderator);
+ if ($debug) Debug.write("canvas.becomeSuperModerator:
",canvas.becomeSuperModerator);
+
+ canvas.currentusercolor = canvas.getColorForUser();
+
+ if ($debug) Debug.write(hib.userobject);
+ this.parent.setRoomValues.doCall();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<netRemoteCallHib name="setRoomValues" funcname="setRoomValues"
remotecontext="$once{ canvas.thishib }" >
<attribute name="applyDefaultModeration" value="false" type="boolean"
/>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx?rev=1763879&r1=1763878&r2=1763879&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
Sat Oct 8 09:17:56 2016
@@ -84,48 +84,41 @@
}
</method>
- <!---
- Returns a list of all moderators of the current room and parses
- if the current user should receive the supermoderator flag or not
- -->
- <netRemoteCallHib name="getRoomModeratorsByRoomId"
funcname="conferenceservice.getRoomModeratorsByRoomId"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("getRoomModeratorsByRoomId: ", value);
- canvas.becomeSuperModerator = false;
-
- parent.setRoomValues.applyDefaultModeration =
canvas.becomemoderator;
- canvas.becomeSuperModerator = canvas.becomemoderator;
-
- if (!canvas.becomeSuperModerator) {
- for (var i=0;i<value.length;i++) {
-
- if (value[i].user.userId == canvas.userId) {
- parent.setRoomValues.applyDefaultModeration = true;
- canvas.becomeSuperModerator =
value[i].isSuperModerator;
- if ($debug) Debug.info("Make this User to an
Moderator");
- break;
- }
-
- }
- }
-
- if ($debug) Debug.write("canvas.becomemoderator:
",canvas.becomemoderator);
- if ($debug) Debug.write("canvas.becomeSuperModerator:
",canvas.becomeSuperModerator);
-
- canvas.currentusercolor = canvas.getColorForUser();
-
- if ($debug) Debug.write(hib.userobject);
-
- if ($debug) Debug.write("setRoomValues CALL: ");
- this.parent.setRoomValues.doCall();
-
- ]]>
- </handler>
- </netRemoteCallHib>
+ <!---
+ Returns a list of all moderators of the current room and parses
+ if the current user should receive the supermoderator flag or
not
+ -->
+ <netRemoteCallHib name="getRoomModeratorsByRoomId"
funcname="conferenceservice.getRoomModeratorsByRoomId" remotecontext="$once{
canvas.thishib }" >
+ <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug) Debug.write("getRoomModeratorsByRoomId: ",
canvas.userId, value);
+ canvas.becomeSuperModerator = false;
+
+ parent.setRoomValues.applyDefaultModeration =
canvas.becomemoderator;
+ canvas.becomeSuperModerator = canvas.becomemoderator;
+
+ if (!canvas.becomeSuperModerator) {
+ for (var i = 0; i < value.length; ++i) {
+ if (value[i].user.id == canvas.userId) {
+
parent.setRoomValues.applyDefaultModeration = true;
+ canvas.becomeSuperModerator =
value[i].superModerator;
+ if ($debug) Debug.info("Make
this User to an Moderator");
+ break;
+ }
+ }
+ }
+ if ($debug) Debug.write("canvas.becomemoderator:
",canvas.becomemoderator);
+ if ($debug) Debug.write("canvas.becomeSuperModerator:
",canvas.becomeSuperModerator);
+
+ canvas.currentusercolor = canvas.getColorForUser();
+
+ if ($debug) Debug.write(hib.userobject);
+ this.parent.setRoomValues.doCall();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<!---
Returns a list of all users currently in the conference room
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx?rev=1763879&r1=1763878&r2=1763879&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
Sat Oct 8 09:17:56 2016
@@ -93,42 +93,37 @@
}
</method>
- <netRemoteCallHib name="getRoomModeratorsByRoomId"
funcname="conferenceservice.getRoomModeratorsByRoomId"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("getRoomModeratorsByRoomId: ",value);
- canvas.becomeSuperModerator = false;
-
- parent.setRoomValues.applyDefaultModeration =
canvas.becomemoderator;
- canvas.becomeSuperModerator = canvas.becomemoderator;
-
- if (!canvas.becomeSuperModerator) {
- for (var i=0;i<value.length;i++) {
-
- if (value[i].user.userId == canvas.userId) {
- parent.setRoomValues.applyDefaultModeration = true;
- canvas.becomeSuperModerator =
value[i].isSuperModerator;
- if ($debug) Debug.info("Make this User to an
Moderator");
- break;
- }
-
- }
- }
-
- if ($debug) Debug.write("canvas.becomemoderator:
",canvas.becomemoderator);
- if ($debug) Debug.write("canvas.becomeSuperModerator:
",canvas.becomeSuperModerator);
-
- canvas.currentusercolor = canvas.getColorForUser();
-
- if ($debug) Debug.write(hib.userobject);
- this.parent.setRoomValues.doCall();
-
- ]]>
- </handler>
- </netRemoteCallHib>
+ <netRemoteCallHib name="getRoomModeratorsByRoomId"
funcname="conferenceservice.getRoomModeratorsByRoomId" remotecontext="$once{
canvas.thishib }" >
+ <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug) Debug.write("getRoomModeratorsByRoomId: ",
canvas.userId, value);
+ canvas.becomeSuperModerator = false;
+
+ parent.setRoomValues.applyDefaultModeration =
canvas.becomemoderator;
+ canvas.becomeSuperModerator = canvas.becomemoderator;
+
+ if (!canvas.becomeSuperModerator) {
+ for (var i = 0; i < value.length; ++i) {
+ if (value[i].user.id == canvas.userId) {
+
parent.setRoomValues.applyDefaultModeration = true;
+ canvas.becomeSuperModerator =
value[i].superModerator;
+ if ($debug) Debug.info("Make
this User to an Moderator");
+ break;
+ }
+ }
+ }
+ if ($debug) Debug.write("canvas.becomemoderator:
",canvas.becomemoderator);
+ if ($debug) Debug.write("canvas.becomeSuperModerator:
",canvas.becomeSuperModerator);
+
+ canvas.currentusercolor = canvas.getColorForUser();
+
+ if ($debug) Debug.write(hib.userobject);
+ this.parent.setRoomValues.doCall();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<netRemoteCallHib name="setRoomValues" funcname="setRoomValues"
remotecontext="$once{ canvas.thishib }" >
<attribute name="applyDefaultModeration" value="false" type="boolean"
/>
