diff --git a/src/frontend/app/administration/action/action-administration.component.ts b/src/frontend/app/administration/action/action-administration.component.ts index fd4ca1fd72dfea301e08c5861ca7f5aa6ac223b9..56bd1fc453294e8715cf8c3fa859e2b5ba307226 100644 --- a/src/frontend/app/administration/action/action-administration.component.ts +++ b/src/frontend/app/administration/action/action-administration.component.ts @@ -5,7 +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; declare var angularGlobals: any; @@ -17,7 +17,6 @@ declare var angularGlobals: any; }) export class ActionAdministrationComponent implements OnInit { /*HEADER*/ - titleHeader : string; @ViewChild('snav') public sidenavLeft : MatSidenav; @ViewChild('snav2') public sidenavRight : MatSidenav; @@ -34,7 +33,7 @@ export class ActionAdministrationComponent implements OnInit { loading: boolean = 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(); @@ -65,6 +64,7 @@ export class ActionAdministrationComponent implements OnInit { this.actionPagesList = data.action_pagesList; this.keywordsList = data.keywordsList; + this.headerService.headerMessage = this.lang.actionCreation; this.loading = false; }); } @@ -83,6 +83,7 @@ export class ActionAdministrationComponent implements OnInit { this.actionPagesList = data.action_pagesList; this.keywordsList = data.keywordsList; + this.headerService.headerMessage = this.lang.actionModification + " <small>" + data.action.label_action + "</small>"; this.loading = false; }); } diff --git a/src/frontend/app/administration/action/actions-administration.component.ts b/src/frontend/app/administration/action/actions-administration.component.ts index 257d0fc148654629c5145da177376de4b0319b98..7071db19cf15d049c5d45cf592f8920675178145 100644 --- a/src/frontend/app/administration/action/actions-administration.component.ts +++ b/src/frontend/app/administration/action/actions-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; declare var angularGlobals: any; @@ -40,7 +41,7 @@ export class ActionsAdministrationComponent 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(); @@ -63,6 +64,7 @@ export class ActionsAdministrationComponent implements OnInit { this.http.get(this.coreUrl + 'rest/actions') .subscribe((data) => { this.actions = data['actions']; + this.headerService.headerMessage = this.headerService.headerMessage = this.lang.actionModification; this.loading = false; setTimeout(() => { this.dataSource = new MatTableDataSource(this.actions);