Author: vdegtyarev
Date: Tue Nov 15 03:53:02 2016
New Revision: 1769720
URL: http://svn.apache.org/viewvc?rev=1769720&view=rev
Log:
OPENMEETINGS-1376 partially fixed. Userlist is updated correctly when user exit
from the room. Activity actions is added. Shared video Tooltip is corrected.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java?rev=1769720&r1=1769719&r2=1769720&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
Tue Nov 15 03:53:02 2016
@@ -113,6 +113,26 @@ public class ActivitiesPanel extends Bas
broadcast(new TextRoomMessage(room.getRoom().getId(), getUserId(),
RoomMessage.Type.activityRemove, id));
room.allowRight(target, client, Right.whiteBoard);
break;
+ case
reqRightShare:
+
broadcast(new TextRoomMessage(room.getRoom().getId(), getUserId(),
RoomMessage.Type.activityRemove, id));
+
room.allowRight(target, client, Right.share);
+
break;
+ case
reqRightRemote:
+
broadcast(new TextRoomMessage(room.getRoom().getId(), getUserId(),
RoomMessage.Type.activityRemove, id));
+
room.allowRight(target, client, Right.remoteControl);
+
break;
+ case
reqRightA:
+
broadcast(new TextRoomMessage(room.getRoom().getId(), getUserId(),
RoomMessage.Type.activityRemove, id));
+
room.allowRight(target, client, Right.audio);
+
break;
+ case
reqRightMute:
+
broadcast(new TextRoomMessage(room.getRoom().getId(), getUserId(),
RoomMessage.Type.activityRemove, id));
+
room.allowRight(target, client, Right.mute);
+
break;
+ case
reqRightExclusive:
+
broadcast(new TextRoomMessage(room.getRoom().getId(), getUserId(),
RoomMessage.Type.activityRemove, id));
+
room.allowRight(target, client, Right.exclusive);
+
break;
default:
break;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1769720&r1=1769719&r2=1769720&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
Tue Nov 15 03:53:02 2016
@@ -313,7 +313,7 @@ public class RoomMenuPanel extends Panel
}
public void exit(IPartialPageRequestHandler handler) {
- exit(handler, false);
+ exit(handler, true);
}
public void exit(IPartialPageRequestHandler handler, boolean broadcast)
{
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java?rev=1769720&r1=1769719&r2=1769720&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java
Tue Nov 15 03:53:02 2016
@@ -32,7 +32,7 @@ public class CamActivityIcon extends Roo
@Override
protected String getTitle() {
- return getString("687");
+ return getString(!client.hasActivity(activity) ? "687" : "690");
}
@Override
