Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
fairblue
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hosting
chat
fairblue
Commits
32f51680
Commit
32f51680
authored
6 years ago
by
Tainan Felipe
Browse files
Options
Downloads
Patches
Plain Diff
Fix viewer can view all breakout Rooms
parent
398c8c82
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bigbluebutton-html5/imports/api/meetings/server/publishers.js
+8
-5
8 additions, 5 deletions
...luebutton-html5/imports/api/meetings/server/publishers.js
bigbluebutton-html5/imports/startup/client/base.jsx
+3
-0
3 additions, 0 deletions
bigbluebutton-html5/imports/startup/client/base.jsx
with
11 additions
and
5 deletions
bigbluebutton-html5/imports/api/meetings/server/publishers.js
+
8
−
5
View file @
32f51680
...
...
@@ -3,7 +3,7 @@ import { check } from 'meteor/check';
import
Meetings
from
'
/imports/api/meetings
'
;
import
Logger
from
'
/imports/startup/server/logger
'
;
function
meetings
(
credentials
)
{
function
meetings
(
credentials
,
isModerator
=
false
)
{
const
{
meetingId
,
requesterUserId
,
requesterToken
}
=
credentials
;
check
(
meetingId
,
String
);
...
...
@@ -15,13 +15,16 @@ function meetings(credentials) {
const
selector
=
{
$or
:
[
{
meetingId
},
{
'
meetingProp.isBreakout
'
:
true
,
'
breakoutProps.parentId
'
:
meetingId
,
},
],
};
if
(
isModerator
)
{
selector
.
$or
.
push
({
'
meetingProp.isBreakout
'
:
true
,
'
breakoutProps.parentId
'
:
meetingId
,
});
}
const
options
=
{
fields
:
{
password
:
false
,
...
...
This diff is collapsed.
Click to expand it.
bigbluebutton-html5/imports/startup/client/base.jsx
+
3
−
0
View file @
32f51680
...
...
@@ -167,6 +167,7 @@ const BaseContainer = withTracker(() => {
const
{
credentials
,
loggedIn
}
=
Auth
;
const
{
meetingId
,
requesterUserId
}
=
credentials
;
let
breakoutRoomSubscriptionHandler
;
let
meetingModeratorSubscriptionHandler
;
let
userSubscriptionHandler
;
const
subscriptionErrorHandler
=
{
...
...
@@ -204,6 +205,7 @@ const BaseContainer = withTracker(() => {
// override meteor subscription to verify if is moderator
userSubscriptionHandler
=
Meteor
.
subscribe
(
'
users
'
,
credentials
,
mappedUser
.
isModerator
,
subscriptionErrorHandler
);
breakoutRoomSubscriptionHandler
=
Meteor
.
subscribe
(
'
breakouts
'
,
credentials
,
mappedUser
.
isModerator
,
subscriptionErrorHandler
);
breakoutRoomSubscriptionHandler
=
Meteor
.
subscribe
(
'
meetings
'
,
credentials
,
mappedUser
.
isModerator
,
subscriptionErrorHandler
);
}
const
annotationsHandler
=
Meteor
.
subscribe
(
'
annotations
'
,
credentials
,
{
...
...
@@ -231,6 +233,7 @@ const BaseContainer = withTracker(() => {
groupChatMessageHandler
,
userSubscriptionHandler
,
breakoutRoomSubscriptionHandler
,
meetingModeratorSubscriptionHandler
,
animations
,
meetingExist
:
!!
Meetings
.
find
({
meetingId
}).
count
(),
User
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment