Author: solomax
Date: Tue Aug 30 11:30:42 2016
New Revision: 1758366
URL: http://svn.apache.org/viewvc?rev=1758366&view=rev
Log:
[OPENMEETINGS-895] 'null' should not be displayed in user list anymore
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1758366&r1=1758365&r2=1758366&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
Tue Aug 30 11:30:42 2016
@@ -27,11 +27,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.openmeetings.core.remote.UserService;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.user.IUserService;
import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
@@ -152,8 +150,7 @@ public class ConnectionsPanel extends Ad
protected void populateItem(final
Item<org.apache.openmeetings.web.app.Client> item) {
org.apache.openmeetings.web.app.Client c =
item.getModelObject();
item.add(new Label("id", ""));
- User u =
getBean(UserService.class).getUserById(getSid(), c.getUserId());
- item.add(new Label("login", u == null ? null :
u.getLogin()));
+ item.add(new Label("login",
c.getUser().getLogin()));
item.add(new Label("since",
c.getConnectedSince()));
item.add(new Label("scope", c.getRoomId() ==
null ? "html5" : "" + c.getRoomId()));
item.add(new ConfirmableAjaxBorder("kick",
getString("603"), getString("605")) {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java?rev=1758366&r1=1758365&r2=1758366&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
Tue Aug 30 11:30:42 2016
@@ -18,13 +18,16 @@
*/
package org.apache.openmeetings.web.app;
+import static org.apache.openmeetings.web.app.Application.getBean;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.room.Room.Right;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.wicket.protocol.ws.api.registry.IKey;
/**
@@ -45,7 +48,7 @@ public class Client implements IDataProv
}
private final String sessionId;
private int pageId;
- private final Long userId;
+ private final User user;
private Long roomId;
private final String uid;
private final Set<Right> rights = new HashSet<>();
@@ -59,7 +62,7 @@ public class Client implements IDataProv
public Client(String sessionId, int pageId, Long userId) {
this.sessionId = sessionId;
this.pageId = pageId;
- this.userId = userId;
+ this.user = getBean(UserDao.class).get(userId);
this.connectedSince = new Date();
uid = UUID.randomUUID().toString();
}
@@ -81,8 +84,12 @@ public class Client implements IDataProv
this.pageId = pageId;
}
+ public User getUser() {
+ return user;
+ }
+
public Long getUserId() {
- return userId;
+ return user.getId();
}
public String getUid() {
@@ -162,7 +169,7 @@ public class Client implements IDataProv
@Override
public String toString() {
- return "Client [uid=" + uid + ", sessionId=" + sessionId + ",
pageId=" + pageId + ", userId=" + userId + ", roomId=" + roomId
+ return "Client [uid=" + uid + ", sessionId=" + sessionId + ",
pageId=" + pageId + ", userId=" + user.getId() + ", roomId=" + roomId
+ ", rights=" + rights + ", activities=" +
activities + ", connectedSince=" + connectedSince + "]";
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java?rev=1758366&r1=1758365&r2=1758366&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
Tue Aug 30 11:30:42 2016
@@ -18,10 +18,8 @@
*/
package org.apache.openmeetings.web.room.sidebar;
-import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Room.Right;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.user.User;
@@ -34,6 +32,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.util.string.Strings;
public class RoomClientPanel extends Panel {
private static final long serialVersionUID = 1L;
@@ -44,9 +43,8 @@ public class RoomClientPanel extends Pan
Client c = item.getModelObject();
item.setMarkupId(String.format("user%s", c.getUid()));
item.add(AttributeAppender.append("style",
String.format("background-image: url(profile/%s);", c.getUserId())));
- User u = getBean(UserDao.class).get(c.getUserId());
add(new RefreshIcon("refresh", c, room));
- add(new Label("name", u.getFirstname() + " " +
u.getLastname()));
+ add(new Label("name", getName(c)));
add(AttributeAppender.append("data-userid", c.getUserId()));
WebMarkupContainer actions = new WebMarkupContainer("actions");
actions.add(new RoomRightPanel("rights", c, room));
@@ -62,7 +60,28 @@ public class RoomClientPanel extends Pan
}
add(actions);
}
-
+
+ private static String getName(Client c) {
+ String delim = "";
+ StringBuilder sb = new StringBuilder();
+ User u = c.getUser();
+ if (!Strings.isEmpty(u.getFirstname())) {
+ sb.append(u.getFirstname());
+ delim = " ";
+ }
+ if (!Strings.isEmpty(u.getLastname())) {
+ sb.append(delim).append(u.getLastname());
+ delim = " ";
+ }
+ if (Strings.isEmpty(sb) && u.getAddress() != null &&
!Strings.isEmpty(u.getAddress().getEmail())) {
+ sb.append(delim).append(u.getAddress().getEmail());
+ }
+ if (Strings.isEmpty(sb)) {
+ sb.append("N/A");
+ }
+ return sb.toString();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1758366&r1=1758365&r2=1758366&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
Tue Aug 30 11:30:42 2016
@@ -27,11 +27,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.openmeetings.core.remote.UserService;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.user.IUserService;
import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
@@ -152,8 +150,7 @@ public class ConnectionsPanel extends Ad
protected void populateItem(final
Item<org.apache.openmeetings.web.app.Client> item) {
org.apache.openmeetings.web.app.Client c =
item.getModelObject();
item.add(new Label("id", ""));
- User u =
getBean(UserService.class).getUserById(getSid(), c.getUserId());
- item.add(new Label("login", u == null ? null :
u.getLogin()));
+ item.add(new Label("login",
c.getUser().getLogin()));
item.add(new Label("since",
c.getConnectedSince()));
item.add(new Label("scope", c.getRoomId() ==
null ? "html5" : "" + c.getRoomId()));
item.add(new ConfirmableAjaxBorder("kick",
getString("603"), getString("605")) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java?rev=1758366&r1=1758365&r2=1758366&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
Tue Aug 30 11:30:42 2016
@@ -18,13 +18,16 @@
*/
package org.apache.openmeetings.web.app;
+import static org.apache.openmeetings.web.app.Application.getBean;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.room.Room.Right;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.wicket.protocol.ws.api.registry.IKey;
/**
@@ -45,7 +48,7 @@ public class Client implements IDataProv
}
private final String sessionId;
private int pageId;
- private final Long userId;
+ private final User user;
private Long roomId;
private final String uid;
private final Set<Right> rights = new HashSet<>();
@@ -59,7 +62,7 @@ public class Client implements IDataProv
public Client(String sessionId, int pageId, Long userId) {
this.sessionId = sessionId;
this.pageId = pageId;
- this.userId = userId;
+ this.user = getBean(UserDao.class).get(userId);
this.connectedSince = new Date();
uid = UUID.randomUUID().toString();
}
@@ -81,8 +84,12 @@ public class Client implements IDataProv
this.pageId = pageId;
}
+ public User getUser() {
+ return user;
+ }
+
public Long getUserId() {
- return userId;
+ return user.getId();
}
public String getUid() {
@@ -162,7 +169,7 @@ public class Client implements IDataProv
@Override
public String toString() {
- return "Client [uid=" + uid + ", sessionId=" + sessionId + ",
pageId=" + pageId + ", userId=" + userId + ", roomId=" + roomId
+ return "Client [uid=" + uid + ", sessionId=" + sessionId + ",
pageId=" + pageId + ", userId=" + user.getId() + ", roomId=" + roomId
+ ", rights=" + rights + ", activities=" +
activities + ", connectedSince=" + connectedSince + "]";
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java?rev=1758366&r1=1758365&r2=1758366&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
Tue Aug 30 11:30:42 2016
@@ -18,10 +18,8 @@
*/
package org.apache.openmeetings.web.room.sidebar;
-import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Room.Right;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.user.User;
@@ -34,6 +32,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.util.string.Strings;
public class RoomClientPanel extends Panel {
private static final long serialVersionUID = 1L;
@@ -44,9 +43,8 @@ public class RoomClientPanel extends Pan
Client c = item.getModelObject();
item.setMarkupId(String.format("user%s", c.getUid()));
item.add(AttributeAppender.append("style",
String.format("background-image: url(profile/%s);", c.getUserId())));
- User u = getBean(UserDao.class).get(c.getUserId());
add(new RefreshIcon("refresh", c, room));
- add(new Label("name", u.getFirstname() + " " +
u.getLastname()));
+ add(new Label("name", getName(c)));
add(AttributeAppender.append("data-userid", c.getUserId()));
WebMarkupContainer actions = new WebMarkupContainer("actions");
actions.add(new RoomRightPanel("rights", c, room));
@@ -62,7 +60,28 @@ public class RoomClientPanel extends Pan
}
add(actions);
}
-
+
+ private static String getName(Client c) {
+ String delim = "";
+ StringBuilder sb = new StringBuilder();
+ User u = c.getUser();
+ if (!Strings.isEmpty(u.getFirstname())) {
+ sb.append(u.getFirstname());
+ delim = " ";
+ }
+ if (!Strings.isEmpty(u.getLastname())) {
+ sb.append(delim).append(u.getLastname());
+ delim = " ";
+ }
+ if (Strings.isEmpty(sb) && u.getAddress() != null &&
!Strings.isEmpty(u.getAddress().getEmail())) {
+ sb.append(delim).append(u.getAddress().getEmail());
+ }
+ if (Strings.isEmpty(sb)) {
+ sb.append("N/A");
+ }
+ return sb.toString();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
