You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2016/11/16 04:18:24 UTC
svn commit: r1769925 - in
/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity:
CamActivityIcon.java MicActivityIcon.java
Author: vdegtyarev
Date: Wed Nov 16 04:18:24 2016
New Revision: 1769925
URL: http://svn.apache.org/viewvc?rev=1769925&view=rev
Log:
OPENMEETINGS-1376 partially fixed. Activity Cam and Mic tooltips are corrected.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
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=1769925&r1=1769924&r2=1769925&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 Wed Nov 16 04:18:24 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.room.sidebar.icon.activity;
+import org.apache.openmeetings.db.entity.room.Room.Right;
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.app.Client.Activity;
import org.apache.openmeetings.web.room.RoomPanel;
@@ -32,7 +33,7 @@ public class CamActivityIcon extends Roo
@Override
protected String getTitle() {
- return getString(!client.hasActivity(activity) ? "687" : "690");
+ return getString(client.hasRight(Right.audio) && client.hasRight(Right.video) ? "690" : "687");
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.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/MicActivityIcon.java?rev=1769925&r1=1769924&r2=1769925&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java Wed Nov 16 04:18:24 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.room.sidebar.icon.activity;
+import org.apache.openmeetings.db.entity.room.Room.Right;
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.app.Client.Activity;
import org.apache.openmeetings.web.room.RoomPanel;
@@ -32,7 +33,7 @@ public class MicActivityIcon extends Roo
@Override
protected String getTitle() {
- return getString("1606");
+ return getString(client.hasRight(Right.audio) ? "1607" : "1606");
}
@Override