Merge pull request #5543 from tsiegleauq/adjust-live-conf-perms

Adjust live stream permission
This commit is contained in:
Emanuel Schütze 2020-09-04 15:01:39 +02:00 committed by GitHub
commit 792f0e5d06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 2 deletions

View File

@ -102,7 +102,7 @@
"karma-jasmine": "~3.1.1", "karma-jasmine": "~3.1.1",
"karma-jasmine-html-reporter": "^1.4.0", "karma-jasmine-html-reporter": "^1.4.0",
"npm-license-crawler": "^0.2.1", "npm-license-crawler": "^0.2.1",
"prettier": "^2.0.5", "prettier": "~2.0.5",
"protractor": "^5.4.3", "protractor": "^5.4.3",
"resize-observer-polyfill": "^1.5.1", "resize-observer-polyfill": "^1.5.1",
"ts-node": "~8.8.1", "ts-node": "~8.8.1",

View File

@ -47,7 +47,7 @@
</mat-card> </mat-card>
</div> </div>
<div class="jitsi-integration" *ngIf="enableJitsi || (videoStreamUrl && canSeeLiveStream)"> <div class="jitsi-integration" *ngIf="showConferenceBar">
<!-- Audio-Conference-bar --> <!-- Audio-Conference-bar -->
<div class="jitsi-bar"> <div class="jitsi-bar">
<span class="control-icon-wrapper apply-theme"> <span class="control-icon-wrapper apply-theme">

View File

@ -138,6 +138,30 @@ export class JitsiComponent extends BaseViewComponent implements OnInit, OnDestr
public canManageSpeaker: boolean; public canManageSpeaker: boolean;
/**
* Jitsi|URL|Perm||Show
* =====|===|====||====
* 0 | 0 | 0 || 0
* 0 | 0 | 1 || 0
* 0 | 1 | 0 || 0
* 0 | 1 | 1 || 1
* 1 | 0 | 0 || 1
* 1 | 0 | 1 || 1
* 1 | 1 | 0 || 0
* 1 | 1 | 1 || 1
*/
public get showConferenceBar(): boolean {
if (this.enableJitsi) {
if (this.videoStreamUrl && !this.canSeeLiveStream) {
return false;
} else {
return true;
}
} else {
return this.videoStreamUrl && this.canSeeLiveStream;
}
}
public get isAccessPermitted(): boolean { public get isAccessPermitted(): boolean {
return !this.restricted || this.canManageSpeaker || this.isOnCurrentLos; return !this.restricted || this.canManageSpeaker || this.isOnCurrentLos;
} }