Fixed an issue that caused team/player sponsor logos to display incor…

…rectly in Admin -> Game -> Players.
cmu-sei · Jan 4, 2024 · 863f31b · 863f31b
1 parent a3d3be4
commit 863f31b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.html b/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.html
@@ -130,8 +130,9 @@ <h4>Players &mdash; {{ctx.game.name}}</h4>
           <fa-icon [icon]="player.checked ? fa.checkSquare : fa.square"></fa-icon>
         </button>
       </div>
+      <!--If teams are collapsed, show all team sponsor logos-->
       <app-player-avatar-list class="cursor-pointer" (click)="view(player)"
-        [avatarUris]="player.teamSponsorLogos | sponsorLogoFileNamesToUris"
+        [avatarUris]="(!teamView ? player.sponsor.logo : player.teamSponsorLogos) | sponsorLogoFileNamesToUris"
         [showSessionStatusWidget]="showSessionStatus" [captainSession]="player.session"></app-player-avatar-list>
       <div class="ml-2">
         <span *ngIf="player.advanced" class="text-success ml-2">
@@ -195,7 +196,6 @@ <h4>Players &mdash; {{ctx.game.name}}</h4>
       </div>
     </div>
   </ng-container>
-
 </ng-container>
 
 <ng-template #loading>

diff --git a/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts b/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts
@@ -6,7 +6,6 @@ import { ActivatedRoute } from '@angular/router';
 import { BsModalService } from 'ngx-bootstrap/modal';
 import { asyncScheduler, BehaviorSubject, combineLatest, firstValueFrom, interval, Observable, scheduled, timer } from 'rxjs';
 import { debounceTime, filter, first, map, mergeAll, switchMap, tap } from 'rxjs/operators';
-import { BoardService } from '../../api/board.service';
 import { Game } from '../../api/game-models';
 import { GameService } from '../../api/game.service';
 import { Player, PlayerSearch } from '../../api/player-models';
@@ -62,7 +61,6 @@ export class PlayerRegistrarComponent {
     private bsModalService: BsModalService,
     private modalConfirmService: ModalConfirmService,
     private api: PlayerService,
-    private boardApi: BoardService,
     private clipboard: ClipboardService,
     private teamService: TeamService,
     private unityService: UnityService