Skip to content

Commit 0848875

Browse files
authored
feat(admin): display any alt repo locations (#17372)
1 parent 35f9cac commit 0848875

File tree

2 files changed

+52
-22
lines changed

2 files changed

+52
-22
lines changed

warehouse/admin/templates/admin/projects/detail.html

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -304,20 +304,20 @@ <h4 class="modal-title" id="exampleModalLabel">Remove role for {{ role.user.user
304304
<th>URL</th>
305305
<th>repr</th>
306306
</tr>
307-
<tbody>
308-
{% for pub in oidc_publishers %}
309-
<tr>
310-
<td>{{ pub.publisher_name }}</td>
311-
{% if pub.publisher_url() %}
312-
<td><a href="{{ pub.publisher_url() }}">{{ pub.publisher_url() }}</a></td>
313-
{% else %}
314-
<td>N/A</td>
315-
{% endif %}
316-
<td><code>{{ pub }}</code></td>
317-
</tr>
318-
{% endfor %}
319-
</tbody>
320307
</thead>
308+
<tbody>
309+
{% for pub in oidc_publishers %}
310+
<tr>
311+
<td>{{ pub.publisher_name }}</td>
312+
{% if pub.publisher_url() %}
313+
<td><a href="{{ pub.publisher_url() }}">{{ pub.publisher_url() }}</a></td>
314+
{% else %}
315+
<td>N/A</td>
316+
{% endif %}
317+
<td><code>{{ pub }}</code></td>
318+
</tr>
319+
{% endfor %}
320+
</tbody>
321321
</table>
322322
</div>
323323
{% else %}
@@ -326,6 +326,36 @@ <h4 class="modal-title" id="exampleModalLabel">Remove role for {{ role.user.user
326326
</div>
327327
</div> <!-- .card #oidc-publishers -->
328328

329+
<div class="card card-info" id="alternate-repositories">
330+
<div class="card-header">Alternate Repositories</div>
331+
<div class="card-body">
332+
{% if project.alternate_repositories %}
333+
<div class="table-responsive p-0">
334+
<table class="table table-hover table-striped">
335+
<thead>
336+
<tr>
337+
<th>Repo name</th>
338+
<th>URL</th>
339+
<th>Description</th>
340+
</tr>
341+
</thead>
342+
<tbody>
343+
{% for alt_repo in project.alternate_repositories %}
344+
<tr>
345+
<td>{{ alt_repo.name }}</td>
346+
<td><a href="{{ alt_repo.url }}">{{ alt_repo.url }}</a></td>
347+
<td>{{ alt_repo.description }}</td>
348+
</tr>
349+
{% endfor %}
350+
</tbody>
351+
</table>
352+
</div>
353+
{% else %}
354+
No alternate repositories configured.
355+
{% endif %}
356+
</div>
357+
</div> <!-- .card #oidc-publishers -->
358+
329359
<div class="card card-primary card-outline collapsed-card" id="project_observations">
330360
<div class="card-header">
331361
<h3 class="card-title">Project Observations</h3>

warehouse/admin/templates/admin/users/detail.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -525,20 +525,20 @@ <h3 class="card-title">Emails</h3>
525525

526526
{% for field in emails_form.emails.entries %}
527527
<div class="row">
528-
<div class="col-7">
528+
<div class="col-sm-7">
529529
{{ render_field("Email", field.email, "email-" ~ loop.index0, class="form-control", placeholder="Email", permission=perms_admin_users_email_write)}}
530530
</div>
531-
<div class="col">
531+
<div class="col-sm">
532532
{{ render_checkbox("Primary", field.primary, "email-primary-" ~ loop.index0, permission=perms_admin_users_email_write)}}
533533
</div>
534-
<div class="col">
534+
<div class="col-sm">
535535
{{ render_checkbox("Verified", field.verified, "email-verified-" ~ loop.index0, permission=perms_admin_users_email_write) }}
536536
</div>
537-
<div class="col">
537+
<div class="col-sm">
538538
{{ render_checkbox("Public", field.public, "email-public-" ~ loop.index0, permission=perms_admin_users_email_write) }}
539539
</div>
540540
{% if breached_email_count[field.email.data] %}
541-
<div class="col">
541+
<div class="col-sm">
542542
Breaches: {{ breached_email_count[field.email.data] }}
543543
</div>
544544
{% endif %}
@@ -577,16 +577,16 @@ <h3 class="card-title">Add a new email</h3>
577577
{% endif %}
578578

579579
<div class="row">
580-
<div class="col-6">
580+
<div class="col-sm-7">
581581
{{ render_field("Email", add_email_form.email, "email", class="form-control", placeholder="Email", permission=perms_admin_users_email_write)}}
582582
</div>
583-
<div class="col">
583+
<div class="col-sm">
584584
{{ render_checkbox("Primary", add_email_form.primary, "email-primary", permission=perms_admin_users_email_write)}}
585585
</div>
586-
<div class="col">
586+
<div class="col-sm">
587587
{{ render_checkbox("Verified", add_email_form.verified, "email-verified", permission=perms_admin_users_email_write) }}
588588
</div>
589-
<div class="col">
589+
<div class="col-sm">
590590
{{ render_checkbox("Public", add_email_form.public, "email-public", permission=perms_admin_users_email_write) }}
591591
</div>
592592
</div>

0 commit comments

Comments
 (0)