From a3342ce250936c30dc6df7563f4e984c172f61c1 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Mon, 8 Oct 2018 15:56:56 +0200
Subject: remove isAdministration

---
 client/package.json                                            |  4 +---
 client/src/app/+admin/users/user-edit/user-edit.component.html | 10 ++++------
 .../app/+admin/users/user-edit/user-password.component.html    |  4 ++--
 client/src/app/+admin/users/user-edit/user-update.component.ts |  7 -------
 client/src/app/+admin/users/users.routes.ts                    |  3 +--
 5 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'client')

diff --git a/client/package.json b/client/package.json
index 5f957bf75..9e5e87d4a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -164,9 +164,7 @@
     "webpack-cli": "^3.0.8",
     "webtorrent": "https://github.com/webtorrent/webtorrent#e9b209c7970816fc29e0cc871157a4918d66001d",
     "whatwg-fetch": "^3.0.0",
-    "zone.js": "~0.8.5"
-  },
-  "dependencies": {
+    "zone.js": "~0.8.5",
     "generate-password-browser": "^1.0.2"
   }
 }
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html
index cbc06c157..b06c91ff3 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/users/user-edit/user-edit.component.html
@@ -82,12 +82,10 @@
   <input type="submit" value="{{ getFormButtonTitle() }}" [disabled]="!form.valid">
 </form>
 
-<div *ngIf="isAdministration">
   <div class="account-title" i18n>Danger Zone</div>
 
-  <p i18n>Send a link to reset the password by mail to the user.</p>
-  <button (click)="resetPassword()" i18n>Ask for new password</button>
+<p i18n>Send a link to reset the password by mail to the user.</p>
+<button (click)="resetPassword()" i18n>Ask for new password</button>
 
-  <p class="mt-4" i18n>Manually set the user password</p>
-  <my-user-password></my-user-password>
-</div>
\ No newline at end of file
+<p class="mt-4" i18n>Manually set the user password</p>
+<my-user-password></my-user-password>
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.html b/client/src/app/+admin/users/user-edit/user-password.component.html
index ee7d8dff5..267422bdd 100644
--- a/client/src/app/+admin/users/user-edit/user-password.component.html
+++ b/client/src/app/+admin/users/user-edit/user-password.component.html
@@ -8,7 +8,7 @@
         </div>
       </div>
       <input id="passwordField" #passwordField
-      [attr.type]="showPassword ? 'text' : 'password'" id="password"
+        [attr.type]="showPassword ? 'text' : 'password'" id="password"
         formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
       >
       <div class="input-group-append">
@@ -22,4 +22,4 @@
   </div>
 
   <input type="submit" value="{{ getFormButtonTitle() }}" [disabled]="!form.valid">
-</form>
\ No newline at end of file
+</form>
diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/users/user-edit/user-update.component.ts
index cb74897d0..4e4002a73 100644
--- a/client/src/app/+admin/users/user-edit/user-update.component.ts
+++ b/client/src/app/+admin/users/user-edit/user-update.component.ts
@@ -21,10 +21,8 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
   userId: number
   userEmail: string
   username: string
-  isAdministration = false
 
   private paramsSub: Subscription
-  private isAdministrationSub: Subscription
 
   constructor (
     protected formValidatorService: FormValidatorService,
@@ -59,15 +57,10 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
         err => this.error = err.message
       )
     })
-
-    this.isAdministrationSub = this.route.data.subscribe(data => {
-      if (data.isAdministration) this.isAdministration = data.isAdministration
-    })
   }
 
   ngOnDestroy () {
     this.paramsSub.unsubscribe()
-    this.isAdministrationSub.unsubscribe()
   }
 
   formValidated () {
diff --git a/client/src/app/+admin/users/users.routes.ts b/client/src/app/+admin/users/users.routes.ts
index 460ebd89e..8b3791bd3 100644
--- a/client/src/app/+admin/users/users.routes.ts
+++ b/client/src/app/+admin/users/users.routes.ts
@@ -44,8 +44,7 @@ export const UsersRoutes: Routes = [
         data: {
           meta: {
             title: 'Update a user'
-          },
-          isAdministration: true
+          }
         }
       }
     ]
-- 
cgit v1.2.3