diff options
author | Chocobozzz <me@florianbigard.com> | 2020-06-16 11:00:35 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-06-16 11:26:46 +0200 |
commit | 5c20a45518c3afc40c9494cad4a78def92e5e288 (patch) | |
tree | d4f6894b37394f3a40e6c58d34012bc55c05f55e /client/src/app/modal | |
parent | 64e0f8cf12c804a7a2fa582fd954f686cea9a45b (diff) | |
download | PeerTube-5c20a45518c3afc40c9494cad4a78def92e5e288.tar.gz PeerTube-5c20a45518c3afc40c9494cad4a78def92e5e288.tar.zst PeerTube-5c20a45518c3afc40c9494cad4a78def92e5e288.zip |
Fix anonymous nsfw policy
Diffstat (limited to 'client/src/app/modal')
-rw-r--r-- | client/src/app/modal/quick-settings-modal.component.html | 13 | ||||
-rw-r--r-- | client/src/app/modal/quick-settings-modal.component.ts | 8 |
2 files changed, 15 insertions, 6 deletions
diff --git a/client/src/app/modal/quick-settings-modal.component.html b/client/src/app/modal/quick-settings-modal.component.html index e2ea51b92..188a51173 100644 --- a/client/src/app/modal/quick-settings-modal.component.html +++ b/client/src/app/modal/quick-settings-modal.component.html | |||
@@ -3,11 +3,15 @@ | |||
3 | <h4 i18n class="modal-title">Settings</h4> | 3 | <h4 i18n class="modal-title">Settings</h4> |
4 | <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon> | 4 | <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon> |
5 | </div> | 5 | </div> |
6 | 6 | ||
7 | <div class="modal-body"> | 7 | <div class="modal-body"> |
8 | <div i18n class="mb-4 quick-settings-title">Display settings</div> | 8 | <div i18n class="mb-4 quick-settings-title">Display settings</div> |
9 | 9 | ||
10 | <my-account-video-settings *ngIf="!isUserLoggedIn()" [user]="user" [userInformationLoaded]="userInformationLoaded" [reactiveUpdate]="true" [notifyOnUpdate]="true"> | 10 | <my-account-video-settings |
11 | *ngIf="!isUserLoggedIn()" | ||
12 | [user]="user" [userInformationLoaded]="userInformationLoaded" [reactiveUpdate]="true" [notifyOnUpdate]="true" | ||
13 | > | ||
14 | |||
11 | <ng-container ngProjectAs="inner-title"> | 15 | <ng-container ngProjectAs="inner-title"> |
12 | <div i18n class="mb-4 mt-4 quick-settings-title">Video settings</div> | 16 | <div i18n class="mb-4 mt-4 quick-settings-title">Video settings</div> |
13 | </ng-container> | 17 | </ng-container> |
@@ -15,6 +19,9 @@ | |||
15 | 19 | ||
16 | <div i18n class="mb-4 mt-4 quick-settings-title">Interface settings</div> | 20 | <div i18n class="mb-4 mt-4 quick-settings-title">Interface settings</div> |
17 | 21 | ||
18 | <my-account-interface-settings *ngIf="!isUserLoggedIn()" [user]="user" [userInformationLoaded]="userInformationLoaded" [reactiveUpdate]="true" [notifyOnUpdate]="true"></my-account-interface-settings> | 22 | <my-account-interface-settings |
23 | *ngIf="!isUserLoggedIn()" | ||
24 | [user]="user" [userInformationLoaded]="userInformationLoaded" [reactiveUpdate]="true" [notifyOnUpdate]="true" | ||
25 | ></my-account-interface-settings> | ||
19 | </div> | 26 | </div> |
20 | </ng-template> | 27 | </ng-template> |
diff --git a/client/src/app/modal/quick-settings-modal.component.ts b/client/src/app/modal/quick-settings-modal.component.ts index 41d6c9f47..155794d1b 100644 --- a/client/src/app/modal/quick-settings-modal.component.ts +++ b/client/src/app/modal/quick-settings-modal.component.ts | |||
@@ -32,9 +32,11 @@ export class QuickSettingsModalComponent extends FormReactive implements OnInit | |||
32 | 32 | ||
33 | ngOnInit () { | 33 | ngOnInit () { |
34 | this.user = this.userService.getAnonymousUser() | 34 | this.user = this.userService.getAnonymousUser() |
35 | this.localStorageService.watch().subscribe( | 35 | this.localStorageService.watch() |
36 | () => this.user = this.userService.getAnonymousUser() | 36 | .subscribe( |
37 | ) | 37 | () => this.user = this.userService.getAnonymousUser() |
38 | ) | ||
39 | |||
38 | this.userInformationLoaded.next(true) | 40 | this.userInformationLoaded.next(true) |
39 | 41 | ||
40 | this.authService.loginChangedSource | 42 | this.authService.loginChangedSource |