k-space/inventory-app
13
0
Fork 0
Code Issues 16 Pull Requests 1 Packages Activity

Read user display names from kubernetes
All checks were successful
ci/woodpecker/manual/woodpecker Pipeline was successful
Details

Browse Source
This commit is contained in:
Madis Mägi
2023-08-05 19:28:10 +03:00
parent 2e65de8c2a
commit 8b9ac4b92b
8 changed files with 43 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inventory-app/templates/inventory_filter.html
View File

@@ -18,7 +18,7 @@
<option value="" disabled {% if not selected %}selected{% endif %}>All</option>
{% for value in values %}
{% if value is mapping %}
<option value="{{ value.foreign_id }}" {% if value.foreign_id == selected %}selected{% endif %}>
<option value="{{ value.username }}" {% if value.username == selected %}selected{% endif %}>
{{ value.display_name }}
</option>
{% else %}

4
inventory-app/templates/inventory_grid.html
View File

@@ -15,8 +15,8 @@
{% if public_view %}
{% if item.inventory.user %}<p>In use</p>{% endif %}
{% else %}
<p>Owner: {% if item.inventory.owner %}{{item.inventory.owner.display_name}}{% endif %}</p>
<p>Current user: {% if item.inventory.user %}{{item.inventory.user.display_name}}{% endif %}</p>
<p>Owner: {% if item.inventory.owner %}{{item.inventory.owner.username | display_name}}{% endif %}</p>
<p>Current user: {% if item.inventory.user %}{{item.inventory.user.username | display_name}}{% endif %}</p>
{% endif %}
<p><a href="/m/inventory/{{ item._id }}/view">more</a></p>
</div>

4
inventory-app/templates/inventory_pick.html
View File

@@ -16,8 +16,8 @@
{% for item in items %}
<tr>
<td>{{ item | format_name }} {{ item.comment }}</td>
<td>{% if item.inventory.owner %}<a href="/m/user/{{ item.inventory.owner.foreign_id }}">{{ item.inventory.owner.display_name }}</a>{% endif %}</td>
<td>{% if item.inventory.user %}<a href="/m/user/{{ item.inventory.user.foreign_id }}">{{ item.inventory.user.display_name }}</a>{% endif %}</td>
<td>{% if item.inventory.owner %}<a href="/m/user/{{ item.inventory.owner.foreign_id }}">{{ item.inventory.owner.username | display_name }}</a>{% endif %}</td>
<td>{% if item.inventory.user %}<a href="/m/user/{{ item.inventory.user.foreign_id }}">{{ item.inventory.user.username | display_name }}</a>{% endif %}</td>
<td>
<form action="/m/inventory/{{item._id}}/{{action_path}}/{{slug}}" method="get">
<button class="waves-effect waves-light btn" type="submit">{{action_label}}</button>

4
inventory-app/templates/inventory_view.html
View File

@@ -57,12 +57,12 @@
<tr>
<td>Owner</td>
<td>{{ item.inventory.get("owner").display_name }}</td>
<td>{{ item.inventory.get("owner").username | display_name }}</td>
</tr>
<tr>
<td>Current user</td>
<td>{{ item.inventory.get("user").display_name }}</td>
<td>{{ item.inventory.get("user").username | display_name }}</td>
</tr>
<tr>