Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Merge requests
!1308
Catchup with main 2.8.1
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Catchup with main 2.8.1
catchup_with_main_2.8.1
into
2.8.2-DEVELOPMENT
Overview
0
Commits
14
Pipelines
1
Changes
1
Merged
Charlotte Hausman
requested to merge
catchup_with_main_2.8.1
into
2.8.2-DEVELOPMENT
1 year ago
Overview
0
Commits
14
Pipelines
1
Changes
1
Expand
0
0
Merge request reports
Viewing commit
7ed7a3c9
Prev
Next
Show latest version
1 file
+
3
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
7ed7a3c9
DAs want highlighting for the AOD column to match the DA column for non-SRDP entries
· 7ed7a3c9
Nathan Bockisch
authored
1 year ago
apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html
+
3
−
2
Options
@@ -244,10 +244,11 @@
</div>
</span>
</td>
<!-- for non-srdp entries, DAs want AOD color highlighting to match the DA one -->
<td
[ngClass]=
"{
'staff-assigned' :
request.assigned_aod
,
'staff-unassigned' :
!request.assigned_aod
'staff-assigned' :
(getMetadata(request).is_srdp && request.assigned_aod) || (!getMetadata(request).is_srdp && request.assigned_da)
,
'staff-unassigned' :
(getMetadata(request).is_srdp && !request.assigned_aod) || (!getMetadata(request).is_srdp && !request.assigned_da)
}"
>
<span
*ngIf=
"qaStaff.AOD"
>
Loading