From 2d23dd37b9d3b474be2d40fc6482fbf2f05e24f0 Mon Sep 17 00:00:00 2001
From: "Patrik J. Braun" <bra.patrik@gmail.com>
Date: Tue, 23 Oct 2018 00:33:17 +0200
Subject: [PATCH] updating random photo url settings

---
 frontend/app/frame/frame.component.html                    | 7 ++++---
 frontend/app/frame/frame.component.ts                      | 2 +-
 .../app/settings/_abstract/abstract.settings.component.ts  | 6 ++++--
 .../app/settings/_abstract/abstract.settings.service.ts    | 4 ++++
 .../settings/random-photo/random-photo.settings.service.ts | 4 ++++
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/frontend/app/frame/frame.component.html b/frontend/app/frame/frame.component.html
index dd7dc7aa..c42696a8 100644
--- a/frontend/app/frame/frame.component.html
+++ b/frontend/app/frame/frame.component.html
@@ -22,7 +22,8 @@
       <li class="nav-item ml-2">
         <app-language class="navbar-btn" isDark="true"></app-language>
       </li>
-      <div class="btn-group" dropdown placement="bottom right"  container="body" >
+      <div class="btn-group" dropdown placement="bottom right"  container="body"
+      *ngIf="isAdmin() || authenticationRequired">
         <button id="button-basic" dropdownToggle
                 type="button" class="btn btn-dark dropdown-toggle"
                 aria-controls="dropdown-basic">
@@ -32,8 +33,8 @@
         </button>
         <ul id="dropdown-basic" *dropdownMenu
             class="dropdown-menu dropdown-menu-right"
-            role="menu" aria-labelledby="button-basic"  >
-          <ng-content  select="[navbar-menu]"></ng-content>
+            role="menu" aria-labelledby="button-basic">
+          <ng-content select="[navbar-menu]"></ng-content>
           <li role="menuitem" *ngIf="isAdmin()">
             <a class="dropdown-item" href="#" [routerLink]="['/admin']">
               <span class="oi oi-wrench"></span>
diff --git a/frontend/app/frame/frame.component.ts b/frontend/app/frame/frame.component.ts
index 231c29d2..9e05b788 100644
--- a/frontend/app/frame/frame.component.ts
+++ b/frontend/app/frame/frame.component.ts
@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from '@angular/core';
+import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
 import {RouterLink} from '@angular/router';
 import {AuthenticationService} from '../model/network/authentication.service';
 import {UserDTO, UserRoles} from '../../../common/entities/UserDTO';
diff --git a/frontend/app/settings/_abstract/abstract.settings.component.ts b/frontend/app/settings/_abstract/abstract.settings.component.ts
index 0b948f82..9b258959 100644
--- a/frontend/app/settings/_abstract/abstract.settings.component.ts
+++ b/frontend/app/settings/_abstract/abstract.settings.component.ts
@@ -10,7 +10,7 @@ import {IPrivateConfig} from '../../../../common/config/private/IPrivateConfig';
 import {I18n} from '@ngx-translate/i18n-polyfill';
 
 
-export abstract class SettingsComponent<T, S extends AbstractSettingsService<T>= AbstractSettingsService<T>>
+export abstract class SettingsComponent<T, S extends AbstractSettingsService<T> = AbstractSettingsService<T>>
   implements OnInit, OnDestroy, OnChanges {
 
   @Input()
@@ -79,7 +79,9 @@ export abstract class SettingsComponent<T, S extends AbstractSettingsService<T>=
   }
 
   ngOnChanges(): void {
-    this.hasAvailableSettings = (this._settingsService.isSupported() || !this.simplifiedMode);
+    this.hasAvailableSettings = ((this._settingsService.isSupported() &&
+      this._settingsService.showInSimplifiedMode())
+      || !this.simplifiedMode);
   }
 
 
diff --git a/frontend/app/settings/_abstract/abstract.settings.service.ts b/frontend/app/settings/_abstract/abstract.settings.service.ts
index d2f4612c..26f52f74 100644
--- a/frontend/app/settings/_abstract/abstract.settings.service.ts
+++ b/frontend/app/settings/_abstract/abstract.settings.service.ts
@@ -15,6 +15,10 @@ export abstract class AbstractSettingsService<T> {
     return this._settingsService.getSettings();
   }
 
+  public showInSimplifiedMode(): boolean {
+    return true;
+  }
+
   isSupported() {
     return true;
   }
diff --git a/frontend/app/settings/random-photo/random-photo.settings.service.ts b/frontend/app/settings/random-photo/random-photo.settings.service.ts
index 4c585f9d..b24dbd38 100644
--- a/frontend/app/settings/random-photo/random-photo.settings.service.ts
+++ b/frontend/app/settings/random-photo/random-photo.settings.service.ts
@@ -14,6 +14,10 @@ export class RandomPhotoSettingsService extends AbstractSettingsService<ClientCo
   }
 
 
+  public showInSimplifiedMode(): boolean {
+    return false;
+  }
+
   public isSupported(): boolean {
     return this._settingsService.settings.value.Server.database.type !== DatabaseType.memory;
   }