You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/03/09 07:58:14 UTC

svn commit: r1786105 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/

Author: solomax
Date: Thu Mar  9 07:58:13 2017
New Revision: 1786105

URL: http://svn.apache.org/viewvc?rev=1786105&view=rev
Log:
[OPENMEETINGS-1597] allow/deny buttons are not displayed for non-moderators

Modified:
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.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=1786105&r1=1786104&r2=1786105&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 Thu Mar  9 07:58:13 2017
@@ -166,10 +166,8 @@ public class ActivitiesPanel extends Bas
 				case reqRightAv:
 				case reqRightMute:
 				case reqRightExclusive:
-					if (room.getClient().hasRight(Right.moderator)) {
-						accept.setVisible(true);
-						decline.setVisible(true);
-					}
+					accept.setVisible(room.getClient().hasRight(Right.moderator));
+					decline.setVisible(room.getClient().hasRight(Right.moderator));
 					break;
 				case haveQuestion:
 				case roomEnter:

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java?rev=1786105&r1=1786104&r2=1786105&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java Thu Mar  9 07:58:13 2017
@@ -166,10 +166,8 @@ public class ActivitiesPanel extends Bas
 				case reqRightAv:
 				case reqRightMute:
 				case reqRightExclusive:
-					if (room.getClient().hasRight(Right.moderator)) {
-						accept.setVisible(true);
-						decline.setVisible(true);
-					}
+					accept.setVisible(room.getClient().hasRight(Right.moderator));
+					decline.setVisible(room.getClient().hasRight(Right.moderator));
 					break;
 				case haveQuestion:
 				case roomEnter: