Skip to content
Snippets Groups Projects
Commit c8191572 authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

reset pagination default to 20, fix object errors

parent e4da07f6
No related branches found
No related tags found
2 merge requests!1390Catch up with Main,!1332reset pagination default to 20, fix object errors
Pipeline #9683 canceled
......@@ -118,13 +118,13 @@
</button>
</th>
<th>Current Processing Start Time</th>
<th *ngIf="capability.requires_qa">
<th *ngIf="capability && capability.requires_qa">
Stage 1 Reviewer
<button class="btn bg-transparent border-0 btn-light btn-sm" (click)="toggleFilterMenu()">
<span><i class="text-dark small fas fa-filter"></i></span>
</button>
</th>
<th *ngIf="capability.requires_qa">
<th *ngIf="capability && capability.requires_qa">
Stage 2 Reviewer
<button class="btn bg-transparent border-0 btn-light btn-sm" (click)="toggleFilterMenu()">
<span><i class="text-dark small fas fa-filter"></i></span>
......@@ -197,7 +197,7 @@
>
Processing has not started
</td>
<td *ngIf="capability.requires_qa"
<td *ngIf="capability && capability.requires_qa"
[ngClass]="{
'staff-assigned' : request.stage_1_reviewer,
'staff-unassigned' : !request.stage_1_reviewer
......@@ -245,7 +245,7 @@
</span>
</td>
<!-- for non-srdp entries, DAs want AOD color highlighting to match the DA one -->
<td *ngIf="capability.requires_qa"
<td *ngIf="capability && capability.requires_qa"
[ngClass]="{
'staff-assigned' : (getMetadata(request).is_srdp && request.stage_2_reviewer) || (!getMetadata(request).is_srdp && request.stage_1_reviewer),
'staff-unassigned' : (getMetadata(request).is_srdp && !request.stage_2_reviewer) || (!getMetadata(request).is_srdp && !request.stage_1_reviewer)
......
......@@ -171,7 +171,7 @@ export class ActiveCapabilityRequestsComponent implements OnInit, OnDestroy {
pageStop: number;
pageAllVal: number;
getPageSizeOptions(): number[] {
const pageSizes = [5, 10, 20, 40];
const pageSizes = [20, 40];
const pageSizeOptions = [this.pageAllVal];
pageSizes.forEach((size) => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment