Commits

Tim Donohue authored and GitHub committed b02e4b18c24 Merge
Merge pull request #3074 from alexandrevryghem/fix-advanced-workflows-throwing-404_contribute-main

Fix advanced workflows throwing 404
No tags
gidlmaster

src/app/access-control/group-registry/group-form/members-list/members-list.component.html

Modified
13 13 <table id="ePeopleMembersOfGroup" class="table table-striped table-hover table-bordered">
14 14 <thead>
15 15 <tr>
16 16 <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
17 17 <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
18 18 <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
19 19 <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
20 20 </tr>
21 21 </thead>
22 22 <tbody>
23 - <tr *ngFor="let eperson of (ePeopleMembersOfGroup | async)?.page">
24 - <td class="align-middle">{{eperson.id}}</td>
23 + <tr *ngFor="let epersonDTO of (ePeopleMembersOfGroup | async)?.page">
24 + <td class="align-middle">{{epersonDTO.eperson.id}}</td>
25 25 <td class="align-middle">
26 - <a [routerLink]="getEPersonEditRoute(eperson.id)">
27 - {{ dsoNameService.getName(eperson) }}
26 + <a [routerLink]="getEPersonEditRoute(epersonDTO.eperson.id)">
27 + {{ dsoNameService.getName(epersonDTO.eperson) }}
28 28 </a>
29 29 </td>
30 30 <td class="align-middle">
31 - {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}<br/>
32 - {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }}
31 + {{messagePrefix + '.table.email' | translate}}: {{ epersonDTO.eperson.email ? epersonDTO.eperson.email : '-' }}<br/>
32 + {{messagePrefix + '.table.netid' | translate}}: {{ epersonDTO.eperson.netid ? epersonDTO.eperson.netid : '-' }}
33 33 </td>
34 34 <td class="align-middle">
35 35 <div class="btn-group edit-field">
36 - <button (click)="deleteMemberFromGroup(eperson)"
36 + <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
37 + *ngIf="epersonDTO.ableToDelete"
37 38 [disabled]="actionConfig.remove.disabled"
38 39 [ngClass]="['btn btn-sm', actionConfig.remove.css]"
39 - title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(eperson) } }}">
40 + title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
40 41 <i [ngClass]="actionConfig.remove.icon"></i>
41 42 </button>
43 + <button *ngIf="!epersonDTO.ableToDelete"
44 + (click)="addMemberToGroup(epersonDTO.eperson)"
45 + [disabled]="actionConfig.add.disabled"
46 + [ngClass]="['btn btn-sm', actionConfig.add.css]"
47 + title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
48 + <i [ngClass]="actionConfig.add.icon"></i>
49 + </button>
42 50 </div>
43 51 </td>
44 52 </tr>
45 53 </tbody>
46 54 </table>
47 55 </div>
48 56
49 57 </ds-pagination>
50 58
51 59 <div *ngIf="(ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0" class="alert alert-info w-100 mb-2"

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut