mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'feature' into issue_9536

Browse Source
This commit is contained in:
Jeremy Stretch
2022-06-23 10:35:27 -04:00
committed by GitHub
parent 81cea9b9d9 f563ba7a9e
commit cfb9605e9b
182 changed files with 3327 additions and 1107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/templates/users/api_tokens.html
View File

@@ -50,7 +50,14 @@
<span class="badge bg-danger">Disabled</span>
{% endif %}
</div>
</div>
<div class="col col-md-3">
<small class="text-muted">Allowed Source IPs</small><br />
{% if token.allowed_ips %}
{{ token.allowed_ips|join:', ' }}
{% else %}
<span>Any</span>
{% endif %}
</div> </div>
{% if token.description %}
<br /><span>{{ token.description }}</span>
{% endif %}

2
netbox/templates/users/profile.html
View File

@@ -21,7 +21,7 @@
{% if request.user.first_name or request.user.last_name %}
{{ request.user.first_name }} {{ request.user.last_name }}
{% else %}
<span class="text-muted">&mdash;</span>
{{ ''|placeholder }}
{% endif %}
</td>
</tr>