Author: solomax
Date: Fri Jan 13 08:32:16 2017
New Revision: 1778515
URL: http://svn.apache.org/viewvc?rev=1778515&view=rev
Log:
[OPENMEETINGS-1376] av broadcast is stopped if correspondent right is removed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1778515&r1=1778514&r2=1778515&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Fri Jan 13 08:32:16 2017
@@ -563,6 +563,12 @@ public class RoomPanel extends BasePanel
for (Right right : rights) {
client.getRights().remove(right);
}
+ if (client.hasActivity(Client.Activity.broadcastA) &&
!client.hasRight(Right.audio)) {
+ client.remove(Client.Activity.broadcastA);
+ }
+ if (client.hasActivity(Client.Activity.broadcastV) &&
!client.hasRight(Right.video)) {
+ client.remove(Client.Activity.broadcastV);
+ }
broadcast(target, client);
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1778515&r1=1778514&r2=1778515&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Fri Jan 13 08:32:16 2017
@@ -565,6 +565,12 @@ public class RoomPanel extends BasePanel
for (Right right : rights) {
client.getRights().remove(right);
}
+ if (client.hasActivity(Client.Activity.broadcastA) &&
!client.hasRight(Right.audio)) {
+ client.remove(Client.Activity.broadcastA);
+ }
+ if (client.hasActivity(Client.Activity.broadcastV) &&
!client.hasRight(Right.video)) {
+ client.remove(Client.Activity.broadcastV);
+ }
broadcast(target, client);
}