svn commit: r1772150 - in /openmeetings/application: branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitati
Author: solomax
Date: Thu Dec 1 08:14:19 2016
New Revision: 1772150
URL: http://svn.apache.org/viewvc?rev=1772150=rev
Log:
[OPENMEETINGS-1514] WB is auto-created for invited user
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1772150=1772149=1772150=diff
==
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
Thu Dec 1 08:14:19 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.core.remote;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -34,6 +35,7 @@ import org.apache.commons.collections4.C
import
org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectListManagerById;
import
org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectSyncManager;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
@@ -43,6 +45,7 @@ import org.apache.openmeetings.db.dto.ro
import org.apache.openmeetings.db.dto.room.WhiteboardObjectList;
import org.apache.openmeetings.db.dto.room.WhiteboardSyncLockObject;
import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -75,6 +78,8 @@ public class WhiteBoardService implement
private SessiondataDao sessionDao;
@Autowired
private LabelDao labelDao;
+ @Autowired
+ private ConfigurationDao cfgDao;
public boolean getNewWhiteboardId(String name) {
try {
@@ -127,7 +132,16 @@ public class WhiteBoardService implement
WhiteboardObjectList whiteboardObjectList =
wbListManagerById.getWhiteBoardObjectListByRoomId(roomId);
if (whiteboardObjectList.getWhiteboardObjects().size()
== 0) {
- wbListManagerById.getNewWhiteboardId(roomId,
labelDao.getString("615",
userDao.get(currentClient.getUserId()).getLanguageId()));
+ Long langId = null;
+ {
+ Long userId = currentClient.getUserId();
+ if (userId != null &&
userId.longValue() < 0) {
+ userId = -userId;
+ }
+ User u = userDao.get(userId);
+ langId = u == null ?
cfgDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1") :
u.getLanguageId();
+ }
+ wbListManagerById.getNewWhiteboardId(roomId,
labelDao.getString("615", langId));
log.debug("Init New Room List");
whiteboardObjectList =
wbListManagerById.getWhiteBoardObjectListByRoomId(roomId);
[jira] [Commented] (OPENMEETINGS-1514) No show whiteboard after send invitation-meeting from Calendar
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1514?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15711285#comment-15711285 ] ASF subversion and git services commented on OPENMEETINGS-1514: --- Commit 1772150 from [~solomax] in branch 'application/branches/3.1.x' [ https://svn.apache.org/r1772150 ] [OPENMEETINGS-1514] WB is auto-created for invited user > No show whiteboard after send invitation-meeting from Calendar > -- > > Key: OPENMEETINGS-1514 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1514 > Project: Openmeetings > Issue Type: Bug >Affects Versions: 3.1.3 > Environment: Debian 8 >Reporter: Alvaro >Assignee: Maxim Solodovnik > Fix For: 3.1.4 > > Attachments: In Lan without Internet connection.png, With Internet > connection.png, without whiteboard.png > > > This is in OM 3.1.4 #466 > Connected or not to Internet, when send an invitation-meeting > to an OM user or not OM user, an d clic on the email inviattion > link, don't show the whiteboard: > (without whiteboard.png). > When is not connection to Internet, the window to send it s > not structred: > (In Lan without Internet connection.png). > When is Internet connection the window to send it is right: > (With Internet connection.png). -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (OPENMEETINGS-1514) No show whiteboard after send invitation-meeting from Calendar
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1514?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alvaro updated OPENMEETINGS-1514: - Attachment: no whiteboard.png ...in OM 3.1.4 #467: Even don't show the whiteboard. 1) I do a meeting in Calendar and send it to h...@hola.com OM user. 2) h...@hola.com user do clic on the email link meeting received, and in the OM room is not whiteboard (attached screenshot). ... > No show whiteboard after send invitation-meeting from Calendar > -- > > Key: OPENMEETINGS-1514 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1514 > Project: Openmeetings > Issue Type: Bug >Affects Versions: 3.1.3 > Environment: Debian 8 >Reporter: Alvaro >Assignee: Maxim Solodovnik > Fix For: 3.1.4 > > Attachments: In Lan without Internet connection.png, With Internet > connection.png, no whiteboard.png, without whiteboard.png > > > This is in OM 3.1.4 #466 > Connected or not to Internet, when send an invitation-meeting > to an OM user or not OM user, an d clic on the email inviattion > link, don't show the whiteboard: > (without whiteboard.png). > When is not connection to Internet, the window to send it s > not structred: > (In Lan without Internet connection.png). > When is Internet connection the window to send it is right: > (With Internet connection.png). -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Resolved] (OPENMEETINGS-1514) No show whiteboard after send invitation-meeting from Calendar
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1514?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1514. Resolution: Fixed Fix Version/s: 3.1.4 WB is fixed, Broken appointment dialog is not reproducible Please provide additional steps > No show whiteboard after send invitation-meeting from Calendar > -- > > Key: OPENMEETINGS-1514 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1514 > Project: Openmeetings > Issue Type: Bug >Affects Versions: 3.1.3 > Environment: Debian 8 >Reporter: Alvaro >Assignee: Maxim Solodovnik > Fix For: 3.1.4 > > Attachments: In Lan without Internet connection.png, With Internet > connection.png, without whiteboard.png > > > This is in OM 3.1.4 #466 > Connected or not to Internet, when send an invitation-meeting > to an OM user or not OM user, an d clic on the email inviattion > link, don't show the whiteboard: > (without whiteboard.png). > When is not connection to Internet, the window to send it s > not structred: > (In Lan without Internet connection.png). > When is Internet connection the window to send it is right: > (With Internet connection.png). -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (OPENMEETINGS-1514) No show whiteboard after send invitation-meeting from Calendar
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1514?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15711346#comment-15711346 ] Maxim Solodovnik commented on OPENMEETINGS-1514: build #467 doesn't contains fix for this issue You can check on this: https://builds.apache.org/view/M-R/view/OpenMeetings/job/Openmeetings%203.1.x/467/ page Please wait for the next build (already in progress) > No show whiteboard after send invitation-meeting from Calendar > -- > > Key: OPENMEETINGS-1514 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1514 > Project: Openmeetings > Issue Type: Bug >Affects Versions: 3.1.3 > Environment: Debian 8 >Reporter: Alvaro >Assignee: Maxim Solodovnik > Fix For: 3.1.4 > > Attachments: In Lan without Internet connection.png, With Internet > connection.png, no whiteboard.png, without whiteboard.png > > > This is in OM 3.1.4 #466 > Connected or not to Internet, when send an invitation-meeting > to an OM user or not OM user, an d clic on the email inviattion > link, don't show the whiteboard: > (without whiteboard.png). > When is not connection to Internet, the window to send it s > not structred: > (In Lan without Internet connection.png). > When is Internet connection the window to send it is right: > (With Internet connection.png). -- This message was sent by Atlassian JIRA (v6.3.4#6332)
