Organisation admins can view the user pages of their members

This commit is contained in:
2022-05-19 16:45:13 +01:00
parent a820fb56e0
commit 5a0906eb43
3 changed files with 31 additions and 2 deletions

View File

@@ -154,6 +154,12 @@ class OrganisationPermissions extends BaseSeed
'conditions' => 'always()',
'description' => 'View the organisation page of any organisation.',
]),
'uri_user' => new Permission([
'slug' => 'uri_user',
'name' => 'View organisation member',
'conditions' => 'can_admin_via_orgs(self.id, user.id)',
'description' => 'View the user page of any member of your organisation.',
]),
'uri_organisation_own' => new Permission([
'slug' => 'uri_organisation',
'name' => 'View own organisation',
@@ -262,6 +268,7 @@ class OrganisationPermissions extends BaseSeed
$permissions['restore_organisation']->id,
$permissions['permenent_delete_organisation']->id,
$permissions['uri_user']->id,
$permissions['uri_organisation']->id,
$permissions['uri_deleted_organisations']->id,
@@ -306,6 +313,7 @@ class OrganisationPermissions extends BaseSeed
$permissions['restore_organisation']->id,
$permissions['permenent_delete_organisation']->id,
$permissions['uri_user']->id,
$permissions['uri_organisation']->id,
$permissions['uri_deleted_organisations']->id,
@@ -354,10 +362,11 @@ class OrganisationPermissions extends BaseSeed
$permissions['view_organisation_field_own']->id,
$permissions['update_organisation_field_own']->id,
$permissions['uri_organisation_own']->id,
$permissions['uri_organisations']->id,
$permissions['uri_user']->id,
]);
}
}

View File

@@ -1,5 +1,6 @@
{% extends "tables/users.html.twig" %}
{% use 'tables/partials/organisation-members/column-info.html.twig' %}
{% use 'tables/partials/organisation-members/column-status.html.twig' %}
{% use 'tables/partials/organisation-members/column-actions.html.twig' %}

View File

@@ -0,0 +1,19 @@
{% block table_cell_template_info %}
<script id="{{table.id}}-column-info" type="text/x-handlebars-template">
{%- verbatim %}
<td data-text="{{row.last_name}}">
<strong>
{% endverbatim -%}{% if isOrganisationAdmin(organisation) %}{%- verbatim %}
<a href="{{site.uri.public}}/users/u/{{row.user_name}}">{{row.first_name}} {{row.last_name}} ({{row.user_name}})</a>
{% endverbatim -%}{% else %}{%- verbatim %}
{{row.first_name}} {{row.last_name}} ({{row.user_name}})
{% endverbatim -%}{% endif %}{%- verbatim %}
</strong>
<div class="js-copy-container">
<span class="js-copy-target">{{row.email}}</span>
<button class="btn btn-xs uf-copy-trigger js-copy-trigger"><i class="fas fa-copy"></i></button>
</div>
</td>
{% endverbatim -%}
</script>
{% endblock %}