From ebd6d1aa15cf4d5fe16a4974028c74c88b4f5423 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 26 Oct 2018 17:52:17 +0200
Subject: [PATCH] fix message header

---
 .../priority/priorities-administration.component.ts       | 6 +++---
 .../priority/priority-administration.component.ts         | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/frontend/app/administration/priority/priorities-administration.component.ts b/src/frontend/app/administration/priority/priorities-administration.component.ts
index 1c799490dc2..b3f36c536bf 100644
--- a/src/frontend/app/administration/priority/priorities-administration.component.ts
+++ b/src/frontend/app/administration/priority/priorities-administration.component.ts
@@ -4,6 +4,7 @@ import { HttpClient } from '@angular/common/http';
 import { LANG } from '../../translate.component';
 import { NotificationService } from '../../notification.service';
 import {MatPaginator, MatTableDataSource, MatSort, MatSidenav } from '@angular/material';
+import { HeaderService } from '../../../service/header.service';
 
 declare function $j(selector: any): any;
 
@@ -15,7 +16,6 @@ declare var angularGlobals: any;
 })
 export class PrioritiesAdministrationComponent implements OnInit {
     /*HEADER*/
-    titleHeader                              : string;
     @ViewChild('snav') public  sidenavLeft   : MatSidenav;
     @ViewChild('snav2') public sidenavRight  : MatSidenav;
 
@@ -40,7 +40,7 @@ export class PrioritiesAdministrationComponent implements OnInit {
         this.dataSource.filter = filterValue;
     }
 
-    constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher, public http: HttpClient, private notify: NotificationService) {
+    constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher, public http: HttpClient, private notify: NotificationService, private headerService: HeaderService) {
         $j("link[href='merged_css.php']").remove();
         this.mobileQuery = media.matchMedia('(max-width: 768px)');
         this._mobileQueryListener = () => changeDetectorRef.detectChanges();
@@ -52,7 +52,7 @@ export class PrioritiesAdministrationComponent implements OnInit {
     }
 
     ngOnInit(): void {
-        window['MainHeaderComponent'].refreshTitle(this.lang.administration + ' ' + this.lang.priorities);
+        this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.priorities;
         window['MainHeaderComponent'].setSnav(this.sidenavLeft);
         window['MainHeaderComponent'].setSnavRight(null);
 
diff --git a/src/frontend/app/administration/priority/priority-administration.component.ts b/src/frontend/app/administration/priority/priority-administration.component.ts
index 4bcb98917bb..8c5c58c271a 100644
--- a/src/frontend/app/administration/priority/priority-administration.component.ts
+++ b/src/frontend/app/administration/priority/priority-administration.component.ts
@@ -5,6 +5,7 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { LANG } from '../../translate.component';
 import { NotificationService } from '../../notification.service';
 import { MatSidenav } from '@angular/material';
+import { HeaderService } from '../../../service/header.service';
 
 declare function $j(selector: any): any;
 
@@ -18,7 +19,6 @@ declare var angularGlobals: any;
 export class PriorityAdministrationComponent implements OnInit {
 
     /*HEADER*/
-    titleHeader                              : string;
     @ViewChild('snav') public  sidenavLeft   : MatSidenav;
     @ViewChild('snav2') public sidenavRight  : MatSidenav;
     
@@ -39,7 +39,7 @@ export class PriorityAdministrationComponent implements OnInit {
         default_priority: false
     };
 
-    constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher, public http: HttpClient, private route: ActivatedRoute, private router: Router, private notify: NotificationService) {
+    constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher, public http: HttpClient, private route: ActivatedRoute, private router: Router, private notify: NotificationService, private headerService: HeaderService) {
         $j("link[href='merged_css.php']").remove();
         this.mobileQuery = media.matchMedia('(max-width: 768px)');
         this._mobileQueryListener = () => changeDetectorRef.detectChanges();
@@ -57,14 +57,13 @@ export class PriorityAdministrationComponent implements OnInit {
 
         this.route.params.subscribe((params) => {
             if (typeof params['id'] == "undefined") {
-                window['MainHeaderComponent'].refreshTitle(this.lang.priorityCreation);
+                this.headerService.headerMessage = this.lang.priorityCreation;
                 window['MainHeaderComponent'].setSnav(this.sidenavLeft);
                 window['MainHeaderComponent'].setSnavRight(null);
 
                 this.creationMode = true;
                 this.loading = false;
             } else {
-                window['MainHeaderComponent'].refreshTitle(this.lang.priorityModification);
                 window['MainHeaderComponent'].setSnav(this.sidenavLeft);
                 window['MainHeaderComponent'].setSnavRight(null);
 
@@ -73,6 +72,7 @@ export class PriorityAdministrationComponent implements OnInit {
                 this.http.get(this.coreUrl + "rest/priorities/" + this.id)
                     .subscribe((data: any) => {
                         this.priority = data.priority;
+                        this.headerService.headerMessage = this.lang.priorityModification + " <small>" +  this.priority.label + "</small>";
                         this.priority.useDoctypeDelay = this.priority.delays != null;
                         if (this.priority.working_days === true) {
                             this.priority.working_days = "true";
-- 
GitLab