[develop]: Fix url in subcategories links in monitor page. Fix isSearch condition. Update library
This commit is contained in:
parent
18a187a7a5
commit
f90d0e7351
|
@ -89,7 +89,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
|
||||||
super();
|
super();
|
||||||
this.initRouterParams(_route, event => {
|
this.initRouterParams(_route, event => {
|
||||||
this.isBrowse = event.url.includes('browse');
|
this.isBrowse = event.url.includes('browse');
|
||||||
this.isSearch = event.url.includes('search');
|
this.isSearch = event.url.includes('search/find');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -309,7 +309,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
|
||||||
if(this.isChild) {
|
if(this.isChild) {
|
||||||
return this.stakeholder.parent.alias + '/browse/' + this.stakeholder.type + '/';
|
return this.stakeholder.parent.alias + '/browse/' + this.stakeholder.type + '/';
|
||||||
} else {
|
} else {
|
||||||
return '';
|
return '/';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
|
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
|
||||||
<slider-tab *ngIf="hasPermission(subCategory.visibility)" [tabTitle]="subCategory.name"
|
<slider-tab *ngIf="hasPermission(subCategory.visibility)" [tabTitle]="subCategory.name"
|
||||||
[queryParams]="queryParams" customClass="uk-text-uppercase"
|
[queryParams]="queryParams" customClass="uk-text-uppercase"
|
||||||
[routerLink]="['/', stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
|
[routerLink]="[aliasPrefix, stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
|
||||||
[active]="subCategory.alias === activeSubCategory.alias"></slider-tab>
|
[active]="subCategory.alias === activeSubCategory.alias"></slider-tab>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</slider-tabs>
|
</slider-tabs>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 2c609d3bd0bd65664b854641e3c0b7a421e16aba
|
Subproject commit 3d9e0f25e13c57330de0e04d24d3643acf629036
|
Loading…
Reference in New Issue