Merge pull request #6108 from nextcloud/enh/noid/password-ui

Hide password by default
This commit is contained in:
Simon L. 2025-03-06 16:12:00 +01:00 committed by GitHub
commit 5b6990dfbc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 33 deletions

View file

@ -0,0 +1,27 @@
{# @var c \App\Containers\Container #}
<li>
<span>
{% if c.GetRunningState().value == 'running' %}
<span class="status success"></span>
{{ c.GetDisplayName() }}
(<a href="/api/docker/logs?id={{ c.GetIdentifier() }}" target="_blank">Running</a>)
{% elseif c.GetStartingState().value == 'starting' %}
<span class="status running"></span>
{{ c.GetDisplayName() }}
(<a href="/api/docker/logs?id={{ c.GetIdentifier() }}" target="_blank">Starting</a>)
{% else %}
<span class="status error"></span>
{{ c.GetDisplayName() }}
(<a href="/api/docker/logs?id={{ c.GetIdentifier() }}" target="_blank">Stopped</a>)
{% endif %}
{% if c.GetDocumentation() != '' %}
(<a target="_blank" href="{{ c.GetDocumentation() }}">docs</a>)
{% endif %}
</span>
{% if c.GetUiSecret() != '' %}
<details>
<summary>Show password for {{ c.GetDisplayName() }}</summary>
<input type="text" value="{{ c.GetUiSecret() }}" readonly>
</details>
{% endif %}
</li>

View file

@ -275,39 +275,7 @@
{# @var containers \AIO\Container\Container[] #} {# @var containers \AIO\Container\Container[] #}
{% for container in containers %} {% for container in containers %}
{% if container.GetDisplayName() != '' %} {% if container.GetDisplayName() != '' %}
<li> {% include 'components/container-state.twig' with {'c': container} only %}
{% if container.GetStartingState().value == 'starting' %}
<span class="status running"></span>
<span>{{ container.GetDisplayName() }} (<a href="/api/docker/logs?id={{ container.GetIdentifier() }}" target="_blank">Starting</a>)
{% if container.GetDocumentation() != '' %}
(<a target="_blank" href="{{ container.GetDocumentation() }}">docs</a>)
{% endif %}
{% if container.GetUiSecret() != '' %}
(password: {{ container.GetUiSecret() }})
{% endif %}
</span>
{% elseif container.GetRunningState().value == 'running' %}
<span class="status success"></span>
<span>{{ container.GetDisplayName() }} (<a href="/api/docker/logs?id={{ container.GetIdentifier() }}" target="_blank">Running</a>)
{% if container.GetDocumentation() != '' %}
(<a target="_blank" href="{{ container.GetDocumentation() }}">docs</a>)
{% endif %}
{% if container.GetUiSecret() != '' %}
(password: {{ container.GetUiSecret() }})
{% endif %}
</span>
{% else %}
<span class="status error"></span>
<span>{{ container.GetDisplayName() }} (<a href="/api/docker/logs?id={{ container.GetIdentifier() }}" target="_blank">Stopped</a>)
{% if container.GetDocumentation() != '' %}
(<a target="_blank" href="{{ container.GetDocumentation() }}">docs</a>)
{% endif %}
{% if container.GetUiSecret() != '' %}
(password: {{ container.GetUiSecret() }})
{% endif %}
</span>
{% endif %}
</li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>