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/11/20 14:17:39 UTC
openmeetings git commit: [OPENMEETINGS-1756] intermediate commit
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 1b49cb900 -> 8fbe711f3
[OPENMEETINGS-1756] intermediate commit
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8fbe711f
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8fbe711f
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8fbe711f
Branch: refs/heads/4.0.x
Commit: 8fbe711f3ae4b0d9d51fce95507de46ddae58d94
Parents: 1b49cb9
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Nov 20 21:16:36 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Nov 20 21:16:36 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/app/WebSession.java | 8 +++++++-
.../org/apache/openmeetings/web/pages/HashPage.java | 14 +++++++++-----
.../org/apache/openmeetings/web/room/RoomPanel.java | 5 +++--
.../java/org/apache/openmeetings/web/room/room.js | 3 +++
4 files changed, 22 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8fbe711f/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 4b7538a..b329557 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -305,7 +305,7 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS
tz = getBean(TimezoneUtil.class).getTimeZone(u);
ISO8601FORMAT = FastDateFormat.getInstance(ISO8601_FULL_FORMAT_STRING, tz);
setLocale(LocaleHelper.getLocale(u));
- sdf = FastDateFormat.getDateTimeInstance(SHORT, SHORT, getLocale());
+ sdf = createDateFormat(u);
}
public boolean signIn(String login, String password, Type type, Long domainId) throws OmException {
@@ -563,4 +563,10 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS
public ExtendedClientProperties getExtendedProperties() {
return extProps;
}
+
+ public static FastDateFormat createDateFormat(User u) {
+ return FastDateFormat.getDateTimeInstance(SHORT, SHORT
+ , getBean(TimezoneUtil.class).getTimeZone(u)
+ , LocaleHelper.getLocale(u));
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8fbe711f/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 8bcb98f..7898d3d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -25,6 +25,7 @@ import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_SETTINGS;
import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
+import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -66,7 +67,6 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
private final WebMarkupContainer recContainer = new WebMarkupContainer("panel-recording");
private final VideoInfo vi = new VideoInfo("info", null);
private final VideoPlayer vp = new VideoPlayer("player");
- private String errorKey = "invalid.hash";
private boolean error = true;
private MainPanel mp = null;
private RoomPanel rp = null;
@@ -98,14 +98,18 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
WebSession ws = WebSession.get();
ws.checkHashes(secure, invitation);
+ String errorMsg = getString("invalid.hash");
recContainer.setVisible(false);
add(new EmptyPanel(PANEL_MAIN).setVisible(false));
if (!invitation.isEmpty()) {
Invitation i = ws.getInvitation();
if (i == null) {
- errorKey = "error.hash.invalid";
+ errorMsg = getString("error.hash.invalid");
} else if (!i.isAllowEntry()) {
- errorKey = Valid.OneTime == i.getValid() ? "error.hash.used" : "error.hash.period";
+ FastDateFormat sdf = WebSession.createDateFormat(i.getInvitee());
+ errorMsg = Valid.OneTime == i.getValid()
+ ? getString("error.hash.used")
+ : String.format("%s %s - %s", getString("error.hash.period"), sdf.format(i.getValidFrom()), sdf.format(i.getValidTo()));
} else {
Recording rec = i.getRecording();
if (rec != null) {
@@ -130,7 +134,7 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
} else if (!secure.isEmpty()) {
Long recId = getRecordingId(), roomId = ws.getRoomId();
if (recId == null && roomId == null) {
- errorKey = "1599";
+ errorMsg = getString("1599");
} else if (recId != null) {
recContainer.setVisible(true);
Recording rec = getBean(RecordingDao.class).get(recId);
@@ -166,7 +170,7 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
add(recContainer.add(vi.setShowShare(false).setOutputMarkupPlaceholderTag(true),
vp.setOutputMarkupPlaceholderTag(true)), new InvitationPasswordDialog("i-pass", this));
remove(urlParametersReceivingBehavior);
- add(new MessageDialog("access-denied", getString("invalid.hash"), getString(errorKey), DialogButtons.OK,
+ add(new MessageDialog("access-denied", getString("invalid.hash"), errorMsg, DialogButtons.OK,
DialogIcon.ERROR) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8fbe711f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 513c325..217664d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -60,6 +60,7 @@ import org.apache.openmeetings.db.entity.server.SOAPLogin;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.AuthLevelUtil;
+import org.apache.openmeetings.util.NullStringer;
import org.apache.openmeetings.util.message.RoomMessage;
import org.apache.openmeetings.util.message.RoomMessage.Type;
import org.apache.openmeetings.util.message.TextRoomMessage;
@@ -143,7 +144,7 @@ public class RoomPanel extends BasePanel {
if (!Strings.isEmpty(r.getRedirectURL()) && (ws.getSoapLogin() != null || ws.getInvitation() != null)) {
options.put("reloadUrl", r.getRedirectURL());
}
- StringBuilder sb = new StringBuilder("Room.init(").append(options).append(");")
+ StringBuilder sb = new StringBuilder("Room.init(").append(options.toString(new NullStringer())).append(");")
.append(wb.getInitScript())
.append("Room.setSize();");
target.appendJavaScript(sb);
@@ -478,7 +479,7 @@ public class RoomPanel extends BasePanel {
Client _c = getClient();
boolean self = _c.getUid().equals(c.getUid());
handler.appendJavaScript(String.format("VideoManager.update(%s);"
- , c.streamJson(_c.getSid(), self, getBean(ISessionManager.class)).toString()
+ , c.streamJson(_c.getSid(), self, getBean(ISessionManager.class)).toString(new NullStringer())
));
sidebar.update(handler);
menu.update(handler);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8fbe711f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index 33d9387..0271654 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -350,6 +350,8 @@ var Video = (function() {
const opts = Room.getOptions();
c.screenActivities = _c.screenActivities;
c.activities = _c.activities;
+ c.user.firstName = _c.user.firstName;
+ c.user.lastName = _c.user.lastName;
const hasAudio = VideoUtil.hasAudio(c);
_handleMicStatus(hasAudio);
if (hasAudio) {
@@ -362,6 +364,7 @@ var Video = (function() {
c.pod = _c.pod;
v.dialog('option', 'appendTo', '.pod.pod-' + c.pod);
}
+ v.dialog('option', 'title', _getName());
if (swf[0].update !== undefined) {
c.self ? swf[0].update() : swf[0].update(c);
}