Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use get_short_os_code_name in release status page #712

Merged
merged 2 commits into from
Jan 28, 2020
Merged

Use get_short_os_code_name in release status page #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ffddd4
Use get_short_os_code_name in release status page
cottsay Jan 22, 2020
c87344c
Use dict comprehension per PR feedback
cottsay Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ros_buildfarm/status_page.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
from .common import get_package_repo_data
from .common import get_release_view_name
from .common import get_short_arch
from .common import get_short_os_code_name
from .common import Target
from .config import get_index as get_config_index
from .config import get_release_build_files
Expand Down Expand Up @@ -134,6 +135,8 @@ def build_release_status_page(
'targets': targets,
'short_arches': dict(
[(t.arch, get_short_arch(t.arch)) for t in targets]),
'short_code_names': {
t.os_code_name: get_short_os_code_name(t.os_code_name) for t in targets},
'repos_data': repos_data,

'affected_by_sync': affected_by_sync,
Expand Down Expand Up @@ -230,6 +233,8 @@ def build_debian_repos_status_page(
'targets': targets,
'short_arches': dict(
[(t.arch, get_short_arch(t.arch)) for t in targets]),
'short_code_names': {
t.os_code_name: get_short_os_code_name(t.os_code_name) for t in targets},
'repos_data': repos_data,

'affected_by_sync': None,
Expand Down
2 changes: 1 addition & 1 deletion ros_buildfarm/templates/status/release_status_page.html.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<th class="sortable"><div>Maintainer</div></th>
@[end if]@
@[for target in targets]@
<th><div title="@(target.os_name.capitalize()) @(target.os_code_name.capitalize()) @(target.arch)">@(target.os_code_name[0].upper())@(short_arches[target.arch])</div>@
<th><div title="@(target.os_name.capitalize()) @(target.os_code_name.capitalize()) @(target.arch)">@(short_code_names[target.os_code_name])@(short_arches[target.arch])</div>@
@[for count in package_counts[target]]@
<span class="sum">@count</span>@
@[end for]@
Expand Down