Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions templates/pages/tools/kb/modal/permissions.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,15 @@
}) }}
<div id="visibility-submit{{ rand }}" class="d-none d-flex gap-2 align-items-center">
<div class="flex-grow-1">
<div id="visibility{{ rand }}" class="kb-permission-visibility"></div>
<div id="visibility{{ rand }}"
class="kb-permission-visibility"
aria-label="{{ _n('Target', 'Targets', 1) }}"></div>
</div>
<input type="submit"
name="addvisibility"
value="{{ _x('button', 'Add') }}"
class="btn btn-primary">
<button type="submit"
Comment thread
f2cmb marked this conversation as resolved.
name="addvisibility"
class="btn btn-primary">
{{ _x('button', 'Add') }}
</button>
</div>
</div>
<script>
Expand Down Expand Up @@ -78,9 +81,10 @@
{% endif %}

{# Permissions list #}
<div class="list-group list-group-flush" data-glpi-permissions-list>
<div class="list-group list-group-flush" role="list" data-glpi-permissions-list>
{% for entry in entries %}
<div class="list-group-item d-flex align-items-center gap-2 px-0"
role="listitem"
data-glpi-permission-id="{{ entry.id }}"
data-glpi-permission-itemtype="{{ entry.itemtype }}">

Expand All @@ -105,8 +109,9 @@
{% if entry.is_recursive %}
<span class="badge bg-secondary-lt"
title="{{ __('Recursive') }}"
aria-label="{{ __('Recursive') }}"
Comment thread
f2cmb marked this conversation as resolved.
data-bs-toggle="tooltip">
<i class="ti ti-arrow-iteration me-1"></i>R
<i class="ti ti-arrow-iteration me-1" aria-hidden="true"></i><span aria-hidden="true">R</span>
Comment thread
f2cmb marked this conversation as resolved.
</span>
{% endif %}
</div>
Expand Down
14 changes: 14 additions & 0 deletions tests/e2e/pages/KnowbaseItemPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,5 +239,19 @@ export class KnowbaseItemPage extends GlpiPage
{
return this.getHistoryEvents().filter({hasText: text});
}

public async doOpenPermissionsModal(): Promise<Locator>
{
// Wait for ArticleController to finish initialization (it removes pe-none after attaching all listeners)
// eslint-disable-next-line playwright/no-raw-locators -- No semantic alternative for article container
await this.page.locator('[data-glpi-knowbase-article]:not(.pe-none)').waitFor();
await this.page.getByTitle('More actions').click();
await this.getButton('Targets').click();

const modal = this.page.getByRole('dialog');
await expect(modal).toBeVisible();

return modal;
}
}

Loading
Loading