Merge from develop last fixes

This commit is contained in:
Konstantinos Triantafyllou 2024-10-08 13:18:00 +03:00
commit a8692acf4e
3 changed files with 4 additions and 4 deletions

View File

@ -89,7 +89,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
super();
this.initRouterParams(_route, event => {
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) {
return this.stakeholder.parent.alias + '/browse/' + this.stakeholder.type + '/';
} else {
return '';
return '/';
}
}

View File

@ -55,7 +55,7 @@
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
<slider-tab *ngIf="hasPermission(subCategory.visibility)" [tabTitle]="subCategory.name"
[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>
</ng-template>
</slider-tabs>

@ -1 +1 @@
Subproject commit 59cb69736c4efdbdffa790e8da7a0c31171737a6
Subproject commit 2b8725e1fbe954bbde4f75baee710f4cc7029255