[jira] [Commented] (OPENMEETINGS-1649) HTML5 video need to be implemented
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633271#comment-16633271 ] ASF subversion and git services commented on OPENMEETINGS-1649: --- Commit faf0ceb510c3324b4ab676fb2ac6f249747a3b13 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=faf0ceb ] [OPENMEETINGS-1649] audio volume control seems to work > HTML5 video need to be implemented > -- > > Key: OPENMEETINGS-1649 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1649 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.0.0 > > > Flex video in room should be replaced with HTML5 video -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1649] audio volume control seems to work
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 faf0ceb [OPENMEETINGS-1649] audio volume control seems to work
faf0ceb is described below
commit faf0ceb510c3324b4ab676fb2ac6f249747a3b13
Author: Maxim Solodovnik
AuthorDate: Sun Sep 30 13:44:55 2018 +0700
[OPENMEETINGS-1649] audio volume control seems to work
---
.../apache/openmeetings/web/room/raw-settings.js | 11 +--
.../openmeetings/web/room/raw-video-manager.js | 34
.../org/apache/openmeetings/web/room/raw-video.js | 98 +-
3 files changed, 63 insertions(+), 80 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index b406f9d..a74eb9a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -45,7 +45,7 @@ var MicLevel = (function() {
return;
}
t = Date.now();
- _micActivity(140 * vol); // magic number
+ _micActivity(vol);
};
} catch (err) {
_error(err);
@@ -93,11 +93,8 @@ var VideoSettings = (function() {
}
function _clear(_ms) {
const ms = _ms || (vid.length === 1 ? vid[0].srcObject : null);
- if (ms !== null && 'function' === typeof(ms.getAudioTracks)) {
- ms.getAudioTracks().forEach(function(track) {
- track.stop();
- });
- ms.getVideoTracks().forEach(function(track) {
+ if (ms !== null && 'function' === typeof(ms.getTracks)) {
+ ms.getTracks().forEach(function(track) {
track.stop();
});
if (vid.length === 1) {
@@ -330,7 +327,7 @@ var VideoSettings = (function() {
playBtn.prop('disabled', false).button('refresh');
}
function _micActivity(level) {
- lm.progressbar("value", Math.max(0, level));
+ lm.progressbar("value", Math.max(0, 140 * level)); // magic
number
}
function _setLoading(el) {
el.find('option').remove();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
index 4daf883..28086c1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
@@ -21,29 +21,31 @@ var VideoManager = (function() {
, w = Video().init(msg.client,
VideoUtil.getPos(VideoUtil.getRects(VID_SEL), msg.stream.width,
msg.stream.height + 25))
, v = w.data()
, cl = v.client();
- OmUtil.log(uid + " registered in room");
-
+ OmUtil.log(uid + ' registered in room');
+ //each bool OR
https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackConstraints
+ const constraints = {
+ audio : VideoUtil.hasAudio(cl)
+ , video : VideoUtil.hasVideo(cl)
+ }
+ if (constraints.video) {
+ constraints.video = {
+ mandatory : {
+ maxWidth : cl.width,
+ maxFrameRate : cl.height,
+ }
+ };
+ }
v.setPeer(new kurentoUtils.WebRtcPeer.WebRtcPeerSendonly(
{
localVideo: v.video()
- , mediaConstraints:
- { //each bool OR
https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackConstraints
- audio : VideoUtil.hasAudio(cl)
- , video : VideoUtil.hasVideo(cl)
- /* TODO FIXME {
- mandatory : {
- maxWidth :
cl.width,
- maxFrameRate :
cl.height,
- minFrameRate :
15
[jira] [Commented] (OPENMEETINGS-1939) Duplicated user names and wrong user names (重复的用户名和混乱的用户名)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1939?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633046#comment-16633046 ] Maxim Solodovnik commented on OPENMEETINGS-1939: OK this is not the bug :) you have entered room with id #6 2 times while testing i'm using this feature to test multi-user room :) > Duplicated user names and wrong user names (重复的用户名和混乱的用户名) > -- > > Key: OPENMEETINGS-1939 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1939 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.5 >Reporter: Zhang Gongjie >Assignee: Maxim Solodovnik >Priority: Blocker > Attachments: doc from Zhang Gongjie.docx, > image-2018-09-29-21-42-08-022.png, image-2018-09-29-21-51-24-939.png > > > When entering the room by requesting web service, user names are duplicated > in the left user list. Meanwhile, wrong user names accoure on the chat panel. > 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. > > 2019-09-29 > The following picture is a correct state, > !image-2018-09-29-21-42-08-022.png! > I copied the url, and open the web in the new tab of Chrome browser, a wrong > state occours as shown in the picture below. > !image-2018-09-29-21-51-24-939.png! -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1928) Library versions need to be updated (4.0.6)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1928?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633045#comment-16633045 ] ASF subversion and git services commented on OPENMEETINGS-1928: --- Commit 957fa79b0d41c8e2f8ee97e03eb810bb8f455f60 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=957fa79 ] [OPENMEETINGS-1928] fabricjs is updated > Library versions need to be updated (4.0.6) > --- > > Key: OPENMEETINGS-1928 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1928 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.6 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1934) Delete a single object
[
https://issues.apache.org/jira/browse/OPENMEETINGS-1934?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633044#comment-16633044
]
ASF subversion and git services commented on OPENMEETINGS-1934:
---
Commit 2715c717678e7707e82db1884ec5690b5c879470 in openmeetings's branch
refs/heads/OPENMEETINGS-1934-delete-btn from [~solomax]
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=2715c71 ]
[OPENMEETINGS-1934] initial work on btn replacement
> Delete a single object
> --
>
> Key: OPENMEETINGS-1934
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1934
> Project: Openmeetings
> Issue Type: Improvement
> Components: HTML5/WhiteBoard
>Affects Versions: 4.0.5
>Reporter: Jorge Alberto Londoño Giraldo
>Assignee: Maxim Solodovnik
>Priority: Major
>
> Something that I think is missing in this version is a draft tool to
> eliminate a single created element, be it text, square, line etc ... or that
> each element has an ({color:#FF}*X*{color}) in the upper right to erase
> it (as in previous versions of OM)
> implementation notes:
> https://jsfiddle.net/tornado1979/j987gb6f/
> https://stackoverflow.com/questions/35630508/add-delete-button-on-element-in-canvas-fabric-js
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1928] fabricjs is updated
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 957fa79 [OPENMEETINGS-1928] fabricjs is updated
957fa79 is described below
commit 957fa79b0d41c8e2f8ee97e03eb810bb8f455f60
Author: Maxim Solodovnik
AuthorDate: Sat Sep 29 22:40:33 2018 +0700
[OPENMEETINGS-1928] fabricjs is updated
---
.../org/apache/openmeetings/web/room/wb/fabric.js | 708 ++---
1 file changed, 465 insertions(+), 243 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
index aef061d..d514e65 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
@@ -2,7 +2,7 @@
/* build: `node build.js modules=ALL exclude=gestures,accessors requirejs
minifier=uglifyjs` */
/*! Fabric.js Copyright 2008-2015, Printio (Juriy Zaytsev, Maxim Chernyak) */
-var fabric = fabric || { version: '2.3.4' };
+var fabric = fabric || { version: '2.4.0' };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
}
@@ -49,15 +49,15 @@ fabric.isLikelyNode = typeof Buffer !== 'undefined' &&
* @type array
*/
fabric.SHARED_ATTRIBUTES = [
- "display",
- "transform",
- "fill", "fill-opacity", "fill-rule",
- "opacity",
- "stroke", "stroke-dasharray", "stroke-linecap",
- "stroke-linejoin", "stroke-miterlimit",
- "stroke-opacity", "stroke-width",
- "id", "paint-order",
- "instantiated_by_use"
+ 'display',
+ 'transform',
+ 'fill', 'fill-opacity', 'fill-rule',
+ 'opacity',
+ 'stroke', 'stroke-dasharray', 'stroke-linecap',
+ 'stroke-linejoin', 'stroke-miterlimit',
+ 'stroke-opacity', 'stroke-width',
+ 'id', 'paint-order',
+ 'instantiated_by_use', 'clip-path'
];
/* _FROM_SVG_END_ */
@@ -353,7 +353,7 @@ fabric.Collection = {
* @chainable
*/
insertAt: function (object, index, nonSplicing) {
-var objects = this.getObjects();
+var objects = this._objects;
if (nonSplicing) {
objects[index] = object;
}
@@ -372,7 +372,7 @@ fabric.Collection = {
* @chainable
*/
remove: function() {
-var objects = this.getObjects(),
+var objects = this._objects,
index, somethingRemoved = false;
for (var i = 0, length = arguments.length; i < length; i++) {
@@ -413,12 +413,13 @@ fabric.Collection = {
/**
* Returns an array of children objects of this instance
* Type parameter introduced in 1.3.10
+ * since 2.3.5 this method return always a COPY of the array;
* @param {String} [type] When specified, only objects of this type are
returned
* @return {Array}
*/
getObjects: function(type) {
if (typeof type === 'undefined') {
- return this._objects;
+ return this._objects.concat();
}
return this._objects.filter(function(o) {
return o.type === type;
@@ -431,7 +432,7 @@ fabric.Collection = {
* @return {Self} thisArg
*/
item: function (index) {
-return this.getObjects()[index];
+return this._objects[index];
},
/**
@@ -439,7 +440,7 @@ fabric.Collection = {
* @return {Boolean} true if collection is empty
*/
isEmpty: function () {
-return this.getObjects().length === 0;
+return this._objects.length === 0;
},
/**
@@ -447,7 +448,7 @@ fabric.Collection = {
* @return {Number} Collection size
*/
size: function() {
-return this.getObjects().length;
+return this._objects.length;
},
/**
@@ -456,7 +457,7 @@ fabric.Collection = {
* @return {Boolean} `true` if collection contains an object
*/
contains: function(object) {
-return this.getObjects().indexOf(object) > -1;
+return this._objects.indexOf(object) > -1;
},
/**
@@ -464,7 +465,7 @@ fabric.Collection = {
* @return {Number} complexity
*/
complexity: function () {
-return this.getObjects().reduce(function (memo, current) {
+return this._objects.reduce(function (memo, current) {
memo += current.complexity ? current.complexity() : 0;
return memo;
}, 0);
@@ -1172,6 +1173,20 @@ fabric.CommonMethods = {
},
/**
+ * Creates a canvas element that is a copy of another and is also painted
+ * @static
+ * @memberOf fabric.util
+ * @return {CanvasElement} initialized canvas element
+ */
+copyCanvasElement: function(canvas) {
+ var newCanvas = fabric.document.createElement('canvas');
+ newCanvas.width = canvas.width;
+ newCanvas.height = canvas.height;
+ newCanvas.getContext('2d').drawImage(canvas, 0, 0);
+ return newCanvas;
+},
+
+/**
* Creates image element (works on client and node)
* @static
* @memberOf fabric.util
@
[openmeetings] branch OPENMEETINGS-1934-delete-btn created (now 2715c71)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch OPENMEETINGS-1934-delete-btn in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 2715c71 [OPENMEETINGS-1934] initial work on btn replacement This branch includes the following new commits: new 2715c71 [OPENMEETINGS-1934] initial work on btn replacement The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[openmeetings] 01/01: [OPENMEETINGS-1934] initial work on btn replacement
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch OPENMEETINGS-1934-delete-btn
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 2715c717678e7707e82db1884ec5690b5c879470
Author: Maxim Solodovnik
AuthorDate: Sat Sep 29 22:43:26 2018 +0700
[OPENMEETINGS-1934] initial work on btn replacement
---
.../main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index c43d0ef..7101c80 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -3,8 +3,9 @@ var Wb = function() {
const ACTIVE = 'active', BUMPER = 100, wb = {id: -1, name: ''},
canvases = []
, area = $('.room.wb.area .wb-area .tabs.ui-tabs'), bar =
area.find('.wb-tabbar')
, extraProps = ['uid', 'fileId', 'fileType', 'count', 'slide',
'omType', '_src', 'formula']
- , arrowImg = new Image();
+ , arrowImg = new Image(), delImg = new Image();
arrowImg.src =
'data:image/png;base64,iVBORw0KGgoNSUhEUgAAABwICAYAAADqSp8ZBHNCSVQICAgIfAhkiAlwSFlzygAAAMoBawMUsgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFsSURBVCiRrdI/SEJRFMfx37lPGxqKoGwxKJoaImhpCf8NEUFL9WgLUrPnIyEIa6reVEPQn0GeWDS4NDQETQ2JT4waojUoHBqCoJKWINB3720yIhGl+q7ncj5nuIQ6jWiaq1xmU4IwBACQ5GCAU5D8IECRAkUQzt8V++wmlSrX20e1BoFIrFdwHidIIQhH5O68sgzD/vnOF4m0QyijJGgMQIHZtJdJJ4oNg6qqNr20dKwBaOWKvZFPpZ7qXV3JH4wNSMbjJHGZ7XIlYRiiFkiBsL4CphwLwbck5E7uwMw3ClXD2iRIm
[...]
+ delImg.src = arrowImg.src;
let a, t, z, s, f, mode, slide = 0, width = 0, height = 0
, zoom = 1., zoomMode = 'pageWidth', role = null;
@@ -654,6 +655,11 @@ var Wb = function() {
, y = top + (size -
arrowImg.height) / 2;
ctx.drawImage(arrowImg, x, y);
}
+ , tr: function trControlCallback (ctx, left,
top, size) {
+ const x = left + (size - delImg.width)
/ 2
+ , y = top + (size -
delImg.height) / 2;
+ ctx.drawImage(delImg, x, y);
+ }
}
});
canvas.wbId = wb.id;
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1928] fabricjs is updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new fb2464f [OPENMEETINGS-1928] fabricjs is updated
fb2464f is described below
commit fb2464f109bae0f627652f3b774b53c3b06a3547
Author: Maxim Solodovnik
AuthorDate: Sat Sep 29 22:40:33 2018 +0700
[OPENMEETINGS-1928] fabricjs is updated
---
.../org/apache/openmeetings/web/room/wb/fabric.js | 708 ++---
1 file changed, 465 insertions(+), 243 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
index aef061d..d514e65 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
@@ -2,7 +2,7 @@
/* build: `node build.js modules=ALL exclude=gestures,accessors requirejs
minifier=uglifyjs` */
/*! Fabric.js Copyright 2008-2015, Printio (Juriy Zaytsev, Maxim Chernyak) */
-var fabric = fabric || { version: '2.3.4' };
+var fabric = fabric || { version: '2.4.0' };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
}
@@ -49,15 +49,15 @@ fabric.isLikelyNode = typeof Buffer !== 'undefined' &&
* @type array
*/
fabric.SHARED_ATTRIBUTES = [
- "display",
- "transform",
- "fill", "fill-opacity", "fill-rule",
- "opacity",
- "stroke", "stroke-dasharray", "stroke-linecap",
- "stroke-linejoin", "stroke-miterlimit",
- "stroke-opacity", "stroke-width",
- "id", "paint-order",
- "instantiated_by_use"
+ 'display',
+ 'transform',
+ 'fill', 'fill-opacity', 'fill-rule',
+ 'opacity',
+ 'stroke', 'stroke-dasharray', 'stroke-linecap',
+ 'stroke-linejoin', 'stroke-miterlimit',
+ 'stroke-opacity', 'stroke-width',
+ 'id', 'paint-order',
+ 'instantiated_by_use', 'clip-path'
];
/* _FROM_SVG_END_ */
@@ -353,7 +353,7 @@ fabric.Collection = {
* @chainable
*/
insertAt: function (object, index, nonSplicing) {
-var objects = this.getObjects();
+var objects = this._objects;
if (nonSplicing) {
objects[index] = object;
}
@@ -372,7 +372,7 @@ fabric.Collection = {
* @chainable
*/
remove: function() {
-var objects = this.getObjects(),
+var objects = this._objects,
index, somethingRemoved = false;
for (var i = 0, length = arguments.length; i < length; i++) {
@@ -413,12 +413,13 @@ fabric.Collection = {
/**
* Returns an array of children objects of this instance
* Type parameter introduced in 1.3.10
+ * since 2.3.5 this method return always a COPY of the array;
* @param {String} [type] When specified, only objects of this type are
returned
* @return {Array}
*/
getObjects: function(type) {
if (typeof type === 'undefined') {
- return this._objects;
+ return this._objects.concat();
}
return this._objects.filter(function(o) {
return o.type === type;
@@ -431,7 +432,7 @@ fabric.Collection = {
* @return {Self} thisArg
*/
item: function (index) {
-return this.getObjects()[index];
+return this._objects[index];
},
/**
@@ -439,7 +440,7 @@ fabric.Collection = {
* @return {Boolean} true if collection is empty
*/
isEmpty: function () {
-return this.getObjects().length === 0;
+return this._objects.length === 0;
},
/**
@@ -447,7 +448,7 @@ fabric.Collection = {
* @return {Number} Collection size
*/
size: function() {
-return this.getObjects().length;
+return this._objects.length;
},
/**
@@ -456,7 +457,7 @@ fabric.Collection = {
* @return {Boolean} `true` if collection contains an object
*/
contains: function(object) {
-return this.getObjects().indexOf(object) > -1;
+return this._objects.indexOf(object) > -1;
},
/**
@@ -464,7 +465,7 @@ fabric.Collection = {
* @return {Number} complexity
*/
complexity: function () {
-return this.getObjects().reduce(function (memo, current) {
+return this._objects.reduce(function (memo, current) {
memo += current.complexity ? current.complexity() : 0;
return memo;
}, 0);
@@ -1172,6 +1173,20 @@ fabric.CommonMethods = {
},
/**
+ * Creates a canvas element that is a copy of another and is also painted
+ * @static
+ * @memberOf fabric.util
+ * @return {CanvasElement} initialized canvas element
+ */
+copyCanvasElement: function(canvas) {
+ var newCanvas = fabric.document.createElement('canvas');
+ newCanvas.width = canvas.width;
+ newCanvas.height = canvas.height;
+ newCanvas.getContext('2d').drawImage(canvas, 0, 0);
+ return newCanvas;
+},
+
+/**
* Creates image element (works on client and node)
* @static
* @memberOf fabric.util
@@
[jira] [Commented] (OPENMEETINGS-1928) Library versions need to be updated (4.0.6)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1928?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633043#comment-16633043 ] ASF subversion and git services commented on OPENMEETINGS-1928: --- Commit fb2464f109bae0f627652f3b774b53c3b06a3547 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=fb2464f ] [OPENMEETINGS-1928] fabricjs is updated > Library versions need to be updated (4.0.6) > --- > > Key: OPENMEETINGS-1928 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1928 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.6 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (OPENMEETINGS-1934) Delete a single object
[
https://issues.apache.org/jira/browse/OPENMEETINGS-1934?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Maxim Solodovnik updated OPENMEETINGS-1934:
---
Description:
Something that I think is missing in this version is a draft tool to eliminate
a single created element, be it text, square, line etc ... or that each element
has an ({color:#FF}*X*{color}) in the upper right to erase it (as in
previous versions of OM)
implementation notes:
https://jsfiddle.net/tornado1979/j987gb6f/
https://stackoverflow.com/questions/35630508/add-delete-button-on-element-in-canvas-fabric-js
was:
Something that I think is missing in this version is a draft tool to eliminate
a single created element, be it text, square, line etc ... or that each element
has an ({color:#FF}*X*{color}) in the upper right to erase it (as in
previous versions of OM)
implementation notes: https://jsfiddle.net/tornado1979/j987gb6f/
> Delete a single object
> --
>
> Key: OPENMEETINGS-1934
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1934
> Project: Openmeetings
> Issue Type: Improvement
> Components: HTML5/WhiteBoard
>Affects Versions: 4.0.5
>Reporter: Jorge Alberto Londoño Giraldo
>Assignee: Maxim Solodovnik
>Priority: Major
>
> Something that I think is missing in this version is a draft tool to
> eliminate a single created element, be it text, square, line etc ... or that
> each element has an ({color:#FF}*X*{color}) in the upper right to erase
> it (as in previous versions of OM)
> implementation notes:
> https://jsfiddle.net/tornado1979/j987gb6f/
> https://stackoverflow.com/questions/35630508/add-delete-button-on-element-in-canvas-fabric-js
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Updated] (OPENMEETINGS-1934) Delete a single object
[
https://issues.apache.org/jira/browse/OPENMEETINGS-1934?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Maxim Solodovnik updated OPENMEETINGS-1934:
---
Description:
Something that I think is missing in this version is a draft tool to eliminate
a single created element, be it text, square, line etc ... or that each element
has an ({color:#FF}*X*{color}) in the upper right to erase it (as in
previous versions of OM)
implementation notes: https://jsfiddle.net/tornado1979/j987gb6f/
was:Something that I think is missing in this version is a draft tool to
eliminate a single created element, be it text, square, line etc ... or that
each element has an ({color:#FF}*X*{color}) in the upper right to erase it
(as in previous versions of OM)
> Delete a single object
> --
>
> Key: OPENMEETINGS-1934
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1934
> Project: Openmeetings
> Issue Type: Improvement
> Components: HTML5/WhiteBoard
>Affects Versions: 4.0.5
>Reporter: Jorge Alberto Londoño Giraldo
>Assignee: Maxim Solodovnik
>Priority: Major
>
> Something that I think is missing in this version is a draft tool to
> eliminate a single created element, be it text, square, line etc ... or that
> each element has an ({color:#FF}*X*{color}) in the upper right to erase
> it (as in previous versions of OM)
> implementation notes: https://jsfiddle.net/tornado1979/j987gb6f/
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1934) Delete a single object
[
https://issues.apache.org/jira/browse/OPENMEETINGS-1934?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633027#comment-16633027
]
Maxim Solodovnik commented on OPENMEETINGS-1934:
Can you provide delete icon?
I guess you can draw one :)
I'm not a designer, licenses of all downloadable images need to checked :)
I'll try to check delete on Mac
> Delete a single object
> --
>
> Key: OPENMEETINGS-1934
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1934
> Project: Openmeetings
> Issue Type: Improvement
> Components: HTML5/WhiteBoard
>Affects Versions: 4.0.5
>Reporter: Jorge Alberto Londoño Giraldo
>Assignee: Maxim Solodovnik
>Priority: Major
>
> Something that I think is missing in this version is a draft tool to
> eliminate a single created element, be it text, square, line etc ... or that
> each element has an ({color:#FF}*X*{color}) in the upper right to erase
> it (as in previous versions of OM)
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Updated] (OPENMEETINGS-1939) Duplicated user names and wrong user names (重复的用户名和混乱的用户名)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1939?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Zhang Gongjie updated OPENMEETINGS-1939: Description: When entering the room by requesting web service, user names are duplicated in the left user list. Meanwhile, wrong user names accoure on the chat panel. 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. 2019-09-29 The following picture is a correct state, !image-2018-09-29-21-42-08-022.png! I copied the url, and open the web in the new tab of Chrome browser, a wrong state occours as shown in the picture below. !image-2018-09-29-21-51-24-939.png! was: When entering the room by requesting web service, user names are duplicated in the left user list. Meanwhile, wrong user names accoure on the chat panel. 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. !image-2018-09-29-21-41-09-801.png! > Duplicated user names and wrong user names (重复的用户名和混乱的用户名) > -- > > Key: OPENMEETINGS-1939 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1939 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.5 >Reporter: Zhang Gongjie >Assignee: Maxim Solodovnik >Priority: Blocker > Attachments: doc from Zhang Gongjie.docx, > image-2018-09-29-21-42-08-022.png, image-2018-09-29-21-51-24-939.png > > > When entering the room by requesting web service, user names are duplicated > in the left user list. Meanwhile, wrong user names accoure on the chat panel. > 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. > > 2019-09-29 > The following picture is a correct state, > !image-2018-09-29-21-42-08-022.png! > I copied the url, and open the web in the new tab of Chrome browser, a wrong > state occours as shown in the picture below. > !image-2018-09-29-21-51-24-939.png! -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (OPENMEETINGS-1939) Duplicated user names and wrong user names (重复的用户名和混乱的用户名)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1939?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Zhang Gongjie updated OPENMEETINGS-1939: Attachment: image-2018-09-29-21-51-24-939.png > Duplicated user names and wrong user names (重复的用户名和混乱的用户名) > -- > > Key: OPENMEETINGS-1939 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1939 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.5 >Reporter: Zhang Gongjie >Assignee: Maxim Solodovnik >Priority: Blocker > Attachments: doc from Zhang Gongjie.docx, > image-2018-09-29-21-42-08-022.png, image-2018-09-29-21-51-24-939.png > > > When entering the room by requesting web service, user names are duplicated > in the left user list. Meanwhile, wrong user names accoure on the chat panel. > 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. > > !image-2018-09-29-21-41-09-801.png! > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (OPENMEETINGS-1939) Duplicated user names and wrong user names (重复的用户名和混乱的用户名)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1939?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Zhang Gongjie updated OPENMEETINGS-1939: Attachment: image-2018-09-29-21-42-08-022.png > Duplicated user names and wrong user names (重复的用户名和混乱的用户名) > -- > > Key: OPENMEETINGS-1939 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1939 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.5 >Reporter: Zhang Gongjie >Assignee: Maxim Solodovnik >Priority: Blocker > Attachments: doc from Zhang Gongjie.docx, > image-2018-09-29-21-42-08-022.png > > > When entering the room by requesting web service, user names are duplicated > in the left user list. Meanwhile, wrong user names accoure on the chat panel. > 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. > > !image-2018-09-29-21-41-09-801.png! > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (OPENMEETINGS-1939) Duplicated user names and wrong user names (重复的用户名和混乱的用户名)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1939?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Zhang Gongjie updated OPENMEETINGS-1939: Description: When entering the room by requesting web service, user names are duplicated in the left user list. Meanwhile, wrong user names accoure on the chat panel. 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. !image-2018-09-29-21-41-09-801.png! was: When entering the room by requesting web service, user names are duplicated in the left user list. Meanwhile, wrong user names accoure on the chat panel. 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. > Duplicated user names and wrong user names (重复的用户名和混乱的用户名) > -- > > Key: OPENMEETINGS-1939 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1939 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.5 >Reporter: Zhang Gongjie >Assignee: Maxim Solodovnik >Priority: Blocker > Attachments: doc from Zhang Gongjie.docx > > > When entering the room by requesting web service, user names are duplicated > in the left user list. Meanwhile, wrong user names accoure on the chat panel. > 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. > > !image-2018-09-29-21-41-09-801.png! > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (OPENMEETINGS-1939) Duplicated user names and wrong user names (重复的用户名和混乱的用户名)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1939?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Zhang Gongjie updated OPENMEETINGS-1939: Attachment: (was: screenshot-1.png) > Duplicated user names and wrong user names (重复的用户名和混乱的用户名) > -- > > Key: OPENMEETINGS-1939 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1939 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.5 >Reporter: Zhang Gongjie >Assignee: Maxim Solodovnik >Priority: Blocker > Attachments: doc from Zhang Gongjie.docx > > > When entering the room by requesting web service, user names are duplicated > in the left user list. Meanwhile, wrong user names accoure on the chat panel. > 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. > > !image-2018-09-29-21-41-09-801.png! > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (OPENMEETINGS-1939) Duplicated user names and wrong user names (重复的用户名和混乱的用户名)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1939?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Zhang Gongjie updated OPENMEETINGS-1939: Attachment: screenshot-1.png > Duplicated user names and wrong user names (重复的用户名和混乱的用户名) > -- > > Key: OPENMEETINGS-1939 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1939 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.5 >Reporter: Zhang Gongjie >Assignee: Maxim Solodovnik >Priority: Blocker > Attachments: doc from Zhang Gongjie.docx > > > When entering the room by requesting web service, user names are duplicated > in the left user list. Meanwhile, wrong user names accoure on the chat panel. > 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. > > !image-2018-09-29-21-41-09-801.png! > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1935) Vertical video
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1935?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633016#comment-16633016 ] Maxim Solodovnik commented on OPENMEETINGS-1935: just have tried with video 1920px height, 240px width everything seems to work as expected could you please provide steps to reproduce? Or maybe you can privately share video? > Vertical video > -- > > Key: OPENMEETINGS-1935 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1935 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video >Affects Versions: 4.0.5 >Reporter: Jorge Alberto Londoño Giraldo >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 4.0.5 > > Attachments: Captura de pantalla 2018-09-17 a la(s) 2.24.21 a. > m..png, image-2018-09-19-02-14-34-177.png > > > When a video is imported in vertical format, the controls are left over and > outside the scaling area, which does not allow it to be reproduced since when > leaving that area the controls are hidden. the enter key could also be > enabled. > > !image-2018-09-19-02-14-34-177.png! > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Resolved] (OPENMEETINGS-1937) Method for room hash generation should return ERROR in case of invalid parameters
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1937?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1937. Resolution: Fixed > Method for room hash generation should return ERROR in case of invalid > parameters > - > > Key: OPENMEETINGS-1937 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1937 > Project: Openmeetings > Issue Type: Improvement > Components: SOAP/REST API >Affects Versions: 4.0.5 >Reporter: Dhanashree K >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 4.0.6 > > > Currently room hash is being returned even if it is unusable > Method for hash generation should return ERROR in case hash can't be used for > login -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1937) Method for room hash generation should return ERROR in case of invalid parameters
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1937?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633005#comment-16633005 ] ASF subversion and git services commented on OPENMEETINGS-1937: --- Commit ca5e38aea074060208d2580fc6769b0ac8144d44 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=ca5e38a ] [OPENMEETINGS-1937] externalId/type are required > Method for room hash generation should return ERROR in case of invalid > parameters > - > > Key: OPENMEETINGS-1937 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1937 > Project: Openmeetings > Issue Type: Improvement > Components: SOAP/REST API >Affects Versions: 4.0.5 >Reporter: Dhanashree K >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 4.0.6 > > > Currently room hash is being returned even if it is unusable > Method for hash generation should return ERROR in case hash can't be used for > login -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1937] externalId/type are required
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 ca5e38a [OPENMEETINGS-1937] externalId/type are required
ca5e38a is described below
commit ca5e38aea074060208d2580fc6769b0ac8144d44
Author: Maxim Solodovnik
AuthorDate: Sat Sep 29 20:00:35 2018 +0700
[OPENMEETINGS-1937] externalId/type are required
---
.../openmeetings/db/dao/server/SOAPLoginDao.java | 40 ++
.../openmeetings/webservice/UserWebService.java| 7 ++--
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
index 850b2e9..24228ab 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
@@ -43,30 +43,26 @@ public class SOAPLoginDao {
boolean becomemoderator, boolean showAudioVideoTest,
boolean allowSameURLMultipleTimes, Long recordingId,
boolean allowRecording) {
- try {
- SOAPLogin soapLogin = new SOAPLogin();
- soapLogin.setCreated(new Date());
- soapLogin.setUsed(false);
- soapLogin.setRoomId(roomId);
-
soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes);
- soapLogin.setHash(UUID.randomUUID().toString());
- soapLogin.setRecordingId(recordingId);
- soapLogin.setSessionHash(sessionHash);
- soapLogin.setModerator(becomemoderator);
- soapLogin.setShowAudioVideoTest(showAudioVideoTest);
- soapLogin.setAllowRecording(allowRecording);
+ SOAPLogin soapLogin = new SOAPLogin();
+ soapLogin.setCreated(new Date());
+ soapLogin.setUsed(false);
+ soapLogin.setRoomId(roomId);
+
soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes);
+ soapLogin.setHash(UUID.randomUUID().toString());
+ soapLogin.setRecordingId(recordingId);
+ soapLogin.setSessionHash(sessionHash);
+ soapLogin.setModerator(becomemoderator);
+ soapLogin.setShowAudioVideoTest(showAudioVideoTest);
+ soapLogin.setAllowRecording(allowRecording);
- em.persist(soapLogin);
- em.flush();
- Long soapLoginId = soapLogin.getId();
+ em.persist(soapLogin);
+ em.flush();
+ Long soapLoginId = soapLogin.getId();
- if (soapLoginId != null) {
- return soapLogin.getHash();
- } else {
- log.error("[addSOAPLogin]: Could not store
SOAPLogin");
- }
- } catch (Exception ex2) {
- log.error("[addSOAPLogin]: ", ex2);
+ if (soapLoginId != null) {
+ return soapLogin.getHash();
+ } else {
+ log.error("[addSOAPLogin]: Could not store SOAPLogin");
}
return null;
}
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
index 7953369..de0ad42 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
@@ -301,6 +301,9 @@ public class UserWebService extends BaseWebService {
)
{
return performCall(sid, User.Right.Soap, sd -> {
+ if (Strings.isEmpty(user.getExternalId()) ||
Strings.isEmpty(user.getExternalType())) {
+ return new ServiceResult("externalId and/or
externalType are not set", Type.ERROR);
+ }
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
user.getLogin(), user.getFirstname(),
user.getLastname()
, user.getProfilePictureUrl(),
user.getEmail()
@@ -310,7 +313,7 @@ public class UserWebService extends BaseWebService {
String xmlString = remoteSessionObject.toXml();
- log.debug("xmlString " + xmlString);
+
[jira] [Commented] (OPENMEETINGS-1937) Method for room hash generation should return ERROR in case of invalid parameters
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1937?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633003#comment-16633003 ] ASF subversion and git services commented on OPENMEETINGS-1937: --- Commit d11cd4a9460d86190fe53d9a9324299b365a3992 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=d11cd4a ] [OPENMEETINGS-1937] externalId/type are required > Method for room hash generation should return ERROR in case of invalid > parameters > - > > Key: OPENMEETINGS-1937 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1937 > Project: Openmeetings > Issue Type: Improvement > Components: SOAP/REST API >Affects Versions: 4.0.5 >Reporter: Dhanashree K >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 4.0.6 > > > Currently room hash is being returned even if it is unusable > Method for hash generation should return ERROR in case hash can't be used for > login -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1937] externalId/type are required
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new d11cd4a [OPENMEETINGS-1937] externalId/type are required
d11cd4a is described below
commit d11cd4a9460d86190fe53d9a9324299b365a3992
Author: Maxim Solodovnik
AuthorDate: Sat Sep 29 20:00:35 2018 +0700
[OPENMEETINGS-1937] externalId/type are required
---
.../openmeetings/db/dao/server/SOAPLoginDao.java | 40 ++
.../openmeetings/webservice/UserWebService.java| 7 ++--
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
index 9001a1b..a119f1d 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
@@ -45,30 +45,26 @@ public class SOAPLoginDao {
boolean becomemoderator, boolean showAudioVideoTest,
boolean allowSameURLMultipleTimes, Long recordingId,
boolean allowRecording) {
- try {
- SOAPLogin soapLogin = new SOAPLogin();
- soapLogin.setCreated(new Date());
- soapLogin.setUsed(false);
- soapLogin.setRoomId(roomId);
-
soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes);
- soapLogin.setHash(UUID.randomUUID().toString());
- soapLogin.setRecordingId(recordingId);
- soapLogin.setSessionHash(sessionHash);
- soapLogin.setModerator(becomemoderator);
- soapLogin.setShowAudioVideoTest(showAudioVideoTest);
- soapLogin.setAllowRecording(allowRecording);
+ SOAPLogin soapLogin = new SOAPLogin();
+ soapLogin.setCreated(new Date());
+ soapLogin.setUsed(false);
+ soapLogin.setRoomId(roomId);
+
soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes);
+ soapLogin.setHash(UUID.randomUUID().toString());
+ soapLogin.setRecordingId(recordingId);
+ soapLogin.setSessionHash(sessionHash);
+ soapLogin.setModerator(becomemoderator);
+ soapLogin.setShowAudioVideoTest(showAudioVideoTest);
+ soapLogin.setAllowRecording(allowRecording);
- em.persist(soapLogin);
- em.flush();
- Long soapLoginId = soapLogin.getId();
+ em.persist(soapLogin);
+ em.flush();
+ Long soapLoginId = soapLogin.getId();
- if (soapLoginId != null) {
- return soapLogin.getHash();
- } else {
- log.error("[addSOAPLogin]: Could not store
SOAPLogin");
- }
- } catch (Exception ex2) {
- log.error("[addSOAPLogin]: ", ex2);
+ if (soapLoginId != null) {
+ return soapLogin.getHash();
+ } else {
+ log.error("[addSOAPLogin]: Could not store SOAPLogin");
}
return null;
}
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
index 63bbd6e..55d7113 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
@@ -297,6 +297,9 @@ public class UserWebService extends BaseWebService {
)
{
return performCall(sid, User.Right.Soap, sd -> {
+ if (Strings.isEmpty(user.getExternalId()) ||
Strings.isEmpty(user.getExternalType())) {
+ return new ServiceResult("externalId and/or
externalType are not set", Type.ERROR);
+ }
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
user.getLogin(), user.getFirstname(),
user.getLastname()
, user.getProfilePictureUrl(),
user.getEmail()
@@ -306,7 +309,7 @@ public class UserWebService extends BaseWebService {
String xmlString = remoteSessionObject.toXml();
- log.debug("xmlString " + xmlString);
+
[jira] [Resolved] (OPENMEETINGS-1938) Import restores purged data
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1938?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1938. Resolution: Fixed Fix Version/s: 4.0.6 Should be fixed Would appreciate if you can test it > Import restores purged data > --- > > Key: OPENMEETINGS-1938 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1938 > Project: Openmeetings > Issue Type: Bug > Components: Import/Export >Affects Versions: 4.0.5 > Environment: Ubuntu 16.04VM >Reporter: Aaron Hepp >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > When doing a back-up and a restore on a system, the import process is > bringing purged data. Purged data should be excluded when import process is > ran -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1938) Import restores purged data
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1938?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16632997#comment-16632997 ] ASF subversion and git services commented on OPENMEETINGS-1938: --- Commit 484ffbb9abf302c529611ae395589ebb1d51097e in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=484ffbb ] [OPENMEETINGS-1938] deleted users are not being restored > Import restores purged data > --- > > Key: OPENMEETINGS-1938 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1938 > Project: Openmeetings > Issue Type: Bug > Components: Import/Export >Affects Versions: 4.0.5 > Environment: Ubuntu 16.04VM >Reporter: Aaron Hepp >Assignee: Maxim Solodovnik >Priority: Major > > When doing a back-up and a restore on a system, the import process is > bringing purged data. Purged data should be excluded when import process is > ran -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1938) Import restores purged data
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1938?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16632996#comment-16632996 ] ASF subversion and git services commented on OPENMEETINGS-1938: --- Commit 8e429a067eb6b7d90932540ae663c06095f34964 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=8e429a0 ] [OPENMEETINGS-1938] deleted users are not being restored > Import restores purged data > --- > > Key: OPENMEETINGS-1938 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1938 > Project: Openmeetings > Issue Type: Bug > Components: Import/Export >Affects Versions: 4.0.5 > Environment: Ubuntu 16.04VM >Reporter: Aaron Hepp >Assignee: Maxim Solodovnik >Priority: Major > > When doing a back-up and a restore on a system, the import process is > bringing purged data. Purged data should be excluded when import process is > ran -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1938] deleted users are not being restored
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 484ffbb [OPENMEETINGS-1938] deleted users are not being restored
484ffbb is described below
commit 484ffbb9abf302c529611ae395589ebb1d51097e
Author: Maxim Solodovnik
AuthorDate: Sat Sep 29 19:43:54 2018 +0700
[OPENMEETINGS-1938] deleted users are not being restored
---
.../src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java | 2 +-
.../main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java | 2 +-
.../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
index c44966f..5eda065 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
@@ -123,7 +123,7 @@ public class GroupDao implements
IGroupAdminDataProviderDao {
entity.setUpdatedby(userId);
}
entity.setUpdated(new Date());
- em.merge(entity);
+ entity = em.merge(entity);
}
return entity;
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
index 88a3c86..09a4137 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
@@ -145,7 +145,7 @@ public class UserContactDao {
em.persist(c);
} else {
c.setUpdated(new Date());
- em.merge(c);
+ c = em.merge(c);
}
return c;
}
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index ec5ba1b..b0b12c5 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -552,7 +552,7 @@ public class BackupImport {
List list = readList(ser, f, "users.xml", "users",
User.class);
int minLoginLength = getMinLoginLength();
for (User u : list) {
- if (u.getLogin() == null) {
+ if (u.getLogin() == null || u.isDeleted()) {
continue;
}
// check that email is unique
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1938] deleted users are not being restored
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 8e429a0 [OPENMEETINGS-1938] deleted users are not being restored
8e429a0 is described below
commit 8e429a067eb6b7d90932540ae663c06095f34964
Author: Maxim Solodovnik
AuthorDate: Sat Sep 29 19:43:54 2018 +0700
[OPENMEETINGS-1938] deleted users are not being restored
---
.../src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java | 2 +-
.../main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java | 2 +-
.../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
index c44966f..5eda065 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
@@ -123,7 +123,7 @@ public class GroupDao implements
IGroupAdminDataProviderDao {
entity.setUpdatedby(userId);
}
entity.setUpdated(new Date());
- em.merge(entity);
+ entity = em.merge(entity);
}
return entity;
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
index bac4307..9e87763 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
@@ -146,7 +146,7 @@ public class UserContactDao {
em.persist(c);
} else {
c.setUpdated(new Date());
- em.merge(c);
+ c = em.merge(c);
}
return c;
}
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 367bee4..00bd02d 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -557,7 +557,7 @@ public class BackupImport {
List list = readUserList(f, "users.xml", "users");
int minLoginLength = getMinLoginLength();
for (User u : list) {
- if (u.getLogin() == null) {
+ if (u.getLogin() == null || u.isDeleted()) {
continue;
}
if (u.getType() == User.Type.contact &&
u.getLogin().length() < minLoginLength) {
[jira] [Commented] (OPENMEETINGS-1649) HTML5 video need to be implemented
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16632957#comment-16632957 ] ASF subversion and git services commented on OPENMEETINGS-1649: --- Commit 4c0ff32382c8b52e097632d871deb1ce602da198 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=4c0ff32 ] [OPENMEETINGS-1649] audio-only mode is implemented > HTML5 video need to be implemented > -- > > Key: OPENMEETINGS-1649 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1649 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.0.0 > > > Flex video in room should be replaced with HTML5 video -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1649] audio-only mode is implemented
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 4c0ff32 [OPENMEETINGS-1649] audio-only mode is implemented
4c0ff32 is described below
commit 4c0ff32382c8b52e097632d871deb1ce602da198
Author: Maxim Solodovnik
AuthorDate: Sat Sep 29 18:20:10 2018 +0700
[OPENMEETINGS-1649] audio-only mode is implemented
---
.../java/org/apache/openmeetings/core/remote/KStream.java | 11 +--
.../org/apache/openmeetings/core/remote/KurentoHandler.java | 4
.../java/org/apache/openmeetings/web/room/raw-settings.js | 3 ---
.../main/java/org/apache/openmeetings/web/room/raw-video.js | 10 --
.../src/main/webapp/WEB-INF/classes/applicationContext.xml| 2 +-
openmeetings-web/src/main/webapp/css/raw-room.css | 4
6 files changed, 26 insertions(+), 8 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index d4e28ed..f6210ca 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.openmeetings.core.util.WebSocketHelper;
import org.apache.openmeetings.db.entity.basic.Client;
+import org.apache.openmeetings.db.entity.basic.Client.Activity;
import org.apache.openmeetings.db.util.ws.RoomMessage;
import org.apache.openmeetings.db.util.ws.TextRoomMessage;
import org.kurento.client.Continuation;
@@ -37,6 +38,7 @@ import org.kurento.client.IceCandidateFoundEvent;
import org.kurento.client.MediaFlowOutStateChangeEvent;
import org.kurento.client.MediaFlowState;
import org.kurento.client.MediaPipeline;
+import org.kurento.client.MediaType;
import org.kurento.client.WebRtcEndpoint;
import org.kurento.jsonrpc.JsonUtils;
import org.slf4j.Logger;
@@ -138,8 +140,13 @@ public class KStream implements IKStream {
}
log.debug("PARTICIPANT {}: obtained endpoint for {}", uid,
sender.getUid());
- sender.outgoingMedia.connect(incoming);
-
+ Client c = h.getBySid(sender.getSid());
+ if (c.hasActivity(Activity.broadcastA)) {
+ sender.outgoingMedia.connect(incoming, MediaType.AUDIO);
+ }
+ if (c.hasActivity(Activity.broadcastV)) {
+ sender.outgoingMedia.connect(incoming, MediaType.VIDEO);
+ }
return incoming;
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index bccb63d..928700f 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -323,6 +323,10 @@ public class KurentoHandler {
);
}
+ Client getBySid(String sid) {
+ return cm.getBySid(sid);
+ }
+
public void sendClient(String sid, JSONObject msg) {
WebSocketHelper.sendClient(cm.getBySid(sid), msg);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index 1db8927..b406f9d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -147,21 +147,18 @@ var VideoSettings = (function() {
appendTo: '.cam-row'
, change: function(event, ui) {
_readValues();
- swf.camChanged(s.video.cam);
}
});
mic = vs.find('select.mic').iconselectmenu({
appendTo: '.mic-row'
, change: function(event, ui) {
_readValues();
- swf.micChanged(s.video.mic);
}
});
res = vs.find('select.cam-resolution').iconselectmenu({
appendTo: '.res-row'
, change: function(event, ui) {
_readValues();
- swf.resChanged(s.video.width, s.video.height);
}
});
vidScroll = vs.find('.vid-block .video-conainer');
diff --git
a/openmeetings-we
[jira] [Commented] (OPENMEETINGS-1939) Duplicated user names and wrong user names (重复的用户名和混乱的用户名)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1939?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16632908#comment-16632908 ] Maxim Solodovnik commented on OPENMEETINGS-1939: [~zhanggongjie] Thanks for the detailed description How are you getting room hash? Are you using proxy (nginx apache etc.) ? The error looks like connection is being kept opened by proxy Do you have any errors in openmeetings.log? > Duplicated user names and wrong user names (重复的用户名和混乱的用户名) > -- > > Key: OPENMEETINGS-1939 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1939 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.5 >Reporter: Zhang Gongjie >Assignee: Maxim Solodovnik >Priority: Blocker > Attachments: doc from Zhang Gongjie.docx > > > When entering the room by requesting web service, user names are duplicated > in the left user list. Meanwhile, wrong user names accoure on the chat panel. > 通过请求Web Service进入房间时, 用户列表中出现重复的用户名.在Chat面板中发送消息时,显示的用户名,并不是当前的登录的用户名. > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
