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/25 03:10:27 UTC
svn commit: r1771242 -
/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ExclusiveRightIcon.java
Author: vdegtyarev
Date: Fri Nov 25 03:10:26 2016
New Revision: 1771242
URL: http://svn.apache.org/viewvc?rev=1771242&view=rev
Log:
Merged revision(s) 1771241 from openmeetings/application/branches/3.2.x:
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ExclusiveRightIcon.java
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ExclusiveRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ExclusiveRightIcon.java?rev=1771242&r1=1771241&r2=1771242&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ExclusiveRightIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ExclusiveRightIcon.java Fri Nov 25 03:10:26 2016
@@ -32,15 +32,11 @@ public class ExclusiveRightIcon extends
@Override
protected String getTitle() {
- //TODO this need to be fixed
- String title = self ? "1432" : "1423";
- /*
- if (client.hasRight(right)) {
- title = self ? "1403" : "612";
- } else {
- title = self ? "686" : "694";
- }
- */
- return getString(title);
+ return getString(hasRight() ? "1433" : "1432");
+ }
+
+ @Override
+ protected boolean visible() {
+ return true;
}
}