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 2016/04/26 13:54:59 UTC
svn commit: r1741002 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/
branches/3.2.x/openmeetings-...
Author: solomax
Date: Tue Apr 26 11:54:59 2016
New Revision: 1741002
URL: http://svn.apache.org/viewvc?rev=1741002&view=rev
Log:
[OPENMEETINGS-1120] denied activities are being removed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RoomRightIcon.java
openmeetings/application/trunk/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/activities/Activity.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RoomRightIcon.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=1741002&r1=1741001&r2=1741002&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 Tue Apr 26 11:54:59 2016
@@ -258,64 +258,40 @@ public class RoomPanel extends BasePanel
sidebar.updateUsers(handler);
menu.update(handler);
// TODO should this be fixed?
- //activities.addActivity(m.getUid(), m.getSentUserId(), Activity.Type.roomEnter, handler);
+ //activities.addActivity(new Activity(m, Activity.Type.roomEnter), handler);
break;
case roomExit:
//TODO check user/remove tab
sidebar.updateUsers(handler);
- activities.add(new Activity(m.getUid(), m.getUserId(), Activity.Type.roomExit), handler);
+ activities.add(new Activity(m, Activity.Type.roomExit), handler);
break;
case roomClosed:
handler.add(room.setVisible(false));
roomClosed.open(handler);
break;
case requestRightModerator:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightModerator), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightModerator), handler);
break;
case requestRightWb:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightWb), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightWb), handler);
break;
case requestRightShare:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightShare), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightShare), handler);
break;
case requestRightRemote:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightRemote), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightRemote), handler);
break;
case requestRightA:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightA), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightA), handler);
break;
case requestRightAv:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightAv), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightAv), handler);
break;
case requestRightMute:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightMute), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightMute), handler);
break;
case requestRightExclusive:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightExclusive), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightExclusive), handler);
break;
case activityRemove:
{
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java?rev=1741002&r1=1741001&r2=1741002&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java Tue Apr 26 11:54:59 2016
@@ -20,7 +20,9 @@ package org.apache.openmeetings.web.room
import java.io.Serializable;
import java.util.Date;
-import java.util.UUID;
+
+import org.apache.openmeetings.util.message.RoomMessage;
+import org.apache.openmeetings.util.message.TextRoomMessage;
public class Activity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -42,8 +44,16 @@ public class Activity implements Seriali
private final Date created;
private final Type type;
- public Activity(String uid, Long sender, Type type) {
- this.id = UUID.randomUUID().toString();
+ public Activity(RoomMessage m, Type type) {
+ this(m.getUid(), null, m.getUserId(), type);
+ }
+
+ public Activity(TextRoomMessage m, Type type) {
+ this(m.getUid(), m.getText(), m.getUserId(), type);
+ }
+
+ public Activity(String id, String uid, Long sender, Type type) {
+ this.id = id;
this.uid = uid;
this.sender = sender;
this.type = type;
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RoomRightIcon.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/RoomRightIcon.java?rev=1741002&r1=1741001&r2=1741002&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RoomRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RoomRightIcon.java Tue Apr 26 11:54:59 2016
@@ -62,7 +62,7 @@ public abstract class RoomRightIcon exte
}
protected boolean isClickable() {
- return self || (!self && room.getClient().hasRight(Right.moderator));
+ return (self && !hasRight()) || (!self && room.getClient().hasRight(Right.moderator));
}
protected boolean hasRight() {
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=1741002&r1=1741001&r2=1741002&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 Tue Apr 26 11:54:59 2016
@@ -277,64 +277,40 @@ public class RoomPanel extends BasePanel
sidebar.updateUsers(handler);
menu.update(handler);
// TODO should this be fixed?
- //activities.addActivity(m.getUid(), m.getSentUserId(), Activity.Type.roomEnter, handler);
+ //activities.addActivity(new Activity(m, Activity.Type.roomEnter), handler);
break;
case roomExit:
//TODO check user/remove tab
sidebar.updateUsers(handler);
- activities.add(new Activity(m.getUid(), m.getUserId(), Activity.Type.roomExit), handler);
+ activities.add(new Activity(m, Activity.Type.roomExit), handler);
break;
case roomClosed:
handler.add(room.setVisible(false));
roomClosed.open(handler);
break;
case requestRightModerator:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightModerator), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightModerator), handler);
break;
case requestRightWb:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightWb), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightWb), handler);
break;
case requestRightShare:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightShare), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightShare), handler);
break;
case requestRightRemote:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightRemote), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightRemote), handler);
break;
case requestRightA:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightA), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightA), handler);
break;
case requestRightAv:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightAv), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightAv), handler);
break;
case requestRightMute:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightMute), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightMute), handler);
break;
case requestRightExclusive:
- {
- TextRoomMessage tm = (TextRoomMessage)m;
- activities.add(new Activity(tm.getText(), m.getUserId(), Activity.Type.reqRightExclusive), handler);
- }
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.reqRightExclusive), handler);
break;
case activityRemove:
{
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java?rev=1741002&r1=1741001&r2=1741002&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java Tue Apr 26 11:54:59 2016
@@ -20,7 +20,9 @@ package org.apache.openmeetings.web.room
import java.io.Serializable;
import java.util.Date;
-import java.util.UUID;
+
+import org.apache.openmeetings.util.message.RoomMessage;
+import org.apache.openmeetings.util.message.TextRoomMessage;
public class Activity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -42,8 +44,16 @@ public class Activity implements Seriali
private final Date created;
private final Type type;
- public Activity(String uid, Long sender, Type type) {
- this.id = UUID.randomUUID().toString();
+ public Activity(RoomMessage m, Type type) {
+ this(m.getUid(), null, m.getUserId(), type);
+ }
+
+ public Activity(TextRoomMessage m, Type type) {
+ this(m.getUid(), m.getText(), m.getUserId(), type);
+ }
+
+ public Activity(String id, String uid, Long sender, Type type) {
+ this.id = id;
this.uid = uid;
this.sender = sender;
this.type = type;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RoomRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RoomRightIcon.java?rev=1741002&r1=1741001&r2=1741002&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RoomRightIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RoomRightIcon.java Tue Apr 26 11:54:59 2016
@@ -62,7 +62,7 @@ public abstract class RoomRightIcon exte
}
protected boolean isClickable() {
- return self || (!self && room.getClient().hasRight(Right.moderator));
+ return (self && !hasRight()) || (!self && room.getClient().hasRight(Right.moderator));
}
protected boolean hasRight() {