trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

admin: add .pb-root-link for AdminSiteShell for links that should not be modified

Browse source
This commit is contained in:
Jens Langhammer 2020-11-21 16:21:14 +01:00
parent 517b811a99
commit 49397cef70
7 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
passbook/admin/templates/administration/flow/list.html
View file

@ -86,9 +86,8 @@
</button> </button>
<div slot="modal"></div> <div slot="modal"></div>
</pb-modal-button> </pb-modal-button>
{# TODO: Fix execute link being modified #} <a class="pf-c-button pf-m-secondary pb-root-link" href="{% url 'passbook_admin:flow-execute' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Execute' %}</a>
<a class="pf-c-button pf-m-secondary" href="{% url 'passbook_admin:flow-execute' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Execute' %}</a> <a class="pf-c-button pf-m-secondary pb-root-link" href="{% url 'passbook_admin:flow-export' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Export' %}</a>
<a class="pf-c-button pf-m-secondary" href="{% url 'passbook_admin:flow-export' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Export' %}</a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

2
passbook/admin/templates/administration/provider/list.html
View file

@ -97,7 +97,7 @@
</pb-modal-button> </pb-modal-button>
{% get_links provider as links %} {% get_links provider as links %}
{% for name, href in links.items %} {% for name, href in links.items %}
<a class="pf-c-button pf-m-tertiary" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a> <a class="pf-c-button pf-m-tertiary pb-root-link" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
{% endfor %} {% endfor %}
{% get_htmls provider as htmls %} {% get_htmls provider as htmls %}
{% for html in htmls %} {% for html in htmls %}

2
passbook/admin/templates/administration/source/list.html
View file

@ -95,7 +95,7 @@
</pb-modal-button> </pb-modal-button>
{% get_links source as links %} {% get_links source as links %}
{% for name, href in links %} {% for name, href in links %}
<a class="pf-c-button pf-m-tertiary" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a> <a class="pf-c-button pf-m-tertiary pb-root-link" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
{% endfor %} {% endfor %}
</td> </td>
</tr> </tr>

2
passbook/admin/templates/administration/stage/list.html
View file

@ -90,7 +90,7 @@
</pb-modal-button> </pb-modal-button>
{% get_links stage as links %} {% get_links stage as links %}
{% for name, href in links.items %} {% for name, href in links.items %}
<a class="pf-c-button pf-m-tertiary" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a> <a class="pf-c-button pf-m-tertiary pb-root-link" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
{% endfor %} {% endfor %}
</td> </td>
</tr> </tr>

2
passbook/admin/templates/administration/stage_prompt/list.html
View file

@ -92,7 +92,7 @@
</pb-modal-button> </pb-modal-button>
{% get_links prompt as links %} {% get_links prompt as links %}
{% for name, href in links.items %} {% for name, href in links.items %}
<a class="pf-c-button pf-m-tertiary" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a> <a class="pf-c-button pf-m-tertiary pb-root-link" href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
{% endfor %} {% endfor %}
</td> </td>
</tr> </tr>

6
passbook/admin/templates/administration/user/list.html
View file

@ -63,7 +63,7 @@
<td> <td>
<pb-modal-button href="{% url 'passbook_admin:user-update' pk=user.pk %}"> <pb-modal-button href="{% url 'passbook_admin:user-update' pk=user.pk %}">
<button slot="trigger" class="pf-c-button pf-m-secondary"> <button slot="trigger" class="pf-c-button pf-m-secondary">
{% trans 'Update' %} {% trans 'Edit' %}
</button> </button>
<div slot="modal"></div> <div slot="modal"></div>
</pb-modal-button> </pb-modal-button>
@ -82,8 +82,8 @@
<div slot="modal"></div> <div slot="modal"></div>
</pb-modal-button> </pb-modal-button>
{% endif %} {% endif %}
<a class="pf-c-button pf-m-tertiary" href="{% url 'passbook_admin:user-password-reset' pk=user.pk %}?back={{ request.get_full_path }}">{% trans 'Reset Password' %}</a> <a class="pf-c-button pf-m-tertiary pb-root-link" href="{% url 'passbook_admin:user-password-reset' pk=user.pk %}?back={{ request.get_full_path }}">{% trans 'Reset Password' %}</a>
<a class="pf-c-button pf-m-tertiary" href="{% url 'passbook_core:impersonate-init' user_id=user.pk %}">{% trans 'Impersonate' %}</a> <a class="pf-c-button pf-m-tertiary pb-root-link" href="{% url 'passbook_core:impersonate-init' user_id=user.pk %}">{% trans 'Impersonate' %}</a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

2
passbook/static/static/src/AdminSiteShell.ts
View file

@ -48,7 +48,7 @@ export class AdminSiteShell extends LitElement {
this.querySelector("[slot=body]")!.innerHTML = t; this.querySelector("[slot=body]")!.innerHTML = t;
}).then(() => { }).then(() => {
// Ensure anchors only change the hash // Ensure anchors only change the hash
this.querySelectorAll("a").forEach(a => { this.querySelectorAll<HTMLAnchorElement>("a:not(.pb-root-link)").forEach(a => {
if (a.href === "") { if (a.href === "") {
return; return;
} }