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 2020/04/21 14:52:38 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2289] connected
since displays both date and time
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 26caf7d [OPENMEETINGS-2289] connected since displays both date and time
26caf7d is described below
commit 26caf7d6011c587e38aa972374813baca68f45f3
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Apr 21 21:52:25 2020 +0700
[OPENMEETINGS-2289] connected since displays both date and time
---
.../org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
index 3650099..3f2682c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.web.admin.connection;
import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
+import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
import static org.apache.openmeetings.web.common.confirmation.ConfirmableAjaxBorder.newOkCancelConfirm;
import java.lang.reflect.Field;
@@ -90,7 +91,7 @@ public class ConnectionsPanel extends AdminBasePanel {
Client c = item.getModelObject();
item.add(new Label("type", "html5"));
item.add(new Label("login", c.getUser().getLogin()));
- item.add(new Label("since", c.getConnectedSince()));
+ item.add(new Label("since", getDateFormat().format(c.getConnectedSince())));
item.add(new Label("scope", c.getRoom() == null ? "html5" : "" + c.getRoom().getId()));
item.add(new Label("server", c.getServerId()));
item.add(new BootstrapAjaxLink<String>("kick", null, Buttons.Type.Outline_Danger, new ResourceModel("603")) {