Merge pull request #1900 from CSCfi/CSCTTV-4125

fix callProgrammeId linking in funding calls
CSCfi · Dec 13, 2024 · a04c247 · a04c247
2 parents a2ecd85 + d400e14
commit a04c247
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/app/portal/components/single/single-funding/single-funding.component.html b/src/app/portal/components/single/single-funding/single-funding.component.html
@@ -427,7 +427,7 @@ <h2 class="col-12 col-sm-4 col-lg-3 th">
               <!-- Normal funding -->
               <ng-container *ngIf="!item.euFunding; else euCallProgramme">
                 <div class="col-12 col-sm-8 col-lg-9 td">
-                  <a [routerLink]="'/results/funding-calls/' + item.funder.callProgrammeName">{{ item.funder.callProgrammeName }}</a>
+                  <a [routerLink]="item.funder.callProgrammeId ? '/results/funding-call/' + item.funder.callProgrammeId : '/results/funding-calls/' + item.funder.callProgrammeName">{{ item.funder.callProgrammeName }}</a>
                 </div>
               </ng-container>
 

diff --git a/src/app/portal/models/funding/funder.model.ts b/src/app/portal/models/funding/funder.model.ts
@@ -16,6 +16,7 @@ export class Funder {
     public typeOfFundingId: string,
     public typeOfFundingName: string,
     public callProgrammeName: string,
+    public callProgrammeId: string,
     public callProgrammeNameUnd: string,
     public callProgrammeHomePage: string,
     public frameworkProgramme: string,
@@ -50,6 +51,7 @@ export class FunderAdapter implements Adapter<Funder> {
         ? this.utils.checkTranslation('typeOfFundingName', item)
         : item.typeOfFundingId,
       this.utils.checkTranslation('callProgrammeName', item),
+      item.callProgrammeId,
       item.callProgrammeNameUnd,
       item.callProgrammeHomePage,
       this.utils.checkTranslation(