From c7c3bd8f0bcb915e11ede866eb997f64125410a4 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Thu, 21 Dec 2023 11:31:10 +0300 Subject: [PATCH] refresh bug fix --- src/app/_modules/pages/menu/pages-menu.component.ts | 1 - src/app/_modules/pages/page/page.component.ts | 7 ++++--- src/vniigaz-v2/css/_forms.scss | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/_modules/pages/menu/pages-menu.component.ts b/src/app/_modules/pages/menu/pages-menu.component.ts index d8df33b..9addbb9 100644 --- a/src/app/_modules/pages/menu/pages-menu.component.ts +++ b/src/app/_modules/pages/menu/pages-menu.component.ts @@ -21,7 +21,6 @@ export class PagesMenuComponent implements OnInit { ngOnInit() { if(!this.items){ - this.subscription = combineLatest([ this.pagesService.currentPageSubject, this.pagesService.rootPagesSubject diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts index 8c302be..c681756 100644 --- a/src/app/_modules/pages/page/page.component.ts +++ b/src/app/_modules/pages/page/page.component.ts @@ -15,7 +15,7 @@ export class PageComponent { private url: string; private inited = false; routeSubscription?: Subscription; - subscription: Subscription; + listSubscription: Subscription; constructor( private router: Router, @@ -42,13 +42,14 @@ export class PageComponent { ngOnInit() { - this.listsService.controls().subscribe(res => { + this.listSubscription = this.listsService.controls().subscribe(res => { this.inited ? this.fetch() : this.inited = true; }); } ngOnDestroy() { this.routeSubscription?.unsubscribe(); + this.listSubscription.unsubscribe() } onNavigationEnd(event: NavigationEnd) { @@ -78,7 +79,7 @@ export class PageComponent { this.page = res?.data; if (this.page) { this.pagesService.currentPage = this.page; - this.titleService.setTitle(this.page.title||this.page.h1||this.page.name) + // this.titleService.setTitle(this.page.title||this.page.h1||this.page.name) } this.loading = false; }, error => { diff --git a/src/vniigaz-v2/css/_forms.scss b/src/vniigaz-v2/css/_forms.scss index aabc709..09d081c 100644 --- a/src/vniigaz-v2/css/_forms.scss +++ b/src/vniigaz-v2/css/_forms.scss @@ -361,8 +361,7 @@ form-field-image{ margin-left: 4px; } } - } - + } } .field {