From 130c5ec9bb63f3116f5804465edf979affa3850b Mon Sep 17 00:00:00 2001 From: Craig Williams Date: Tue, 15 Feb 2022 16:52:00 +0000 Subject: [PATCH] Added buttons to join/leave organisations (no functionality yet) --- config/default.php | 5 ++++- locale/en_US/messages.php | 4 +++- src/Twig/OrganisationsExtension.php | 6 +++++- templates/tables/organisations.html.twig | 25 ++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/config/default.php b/config/default.php index d6b459b..8369dfa 100644 --- a/config/default.php +++ b/config/default.php @@ -23,5 +23,8 @@ return [ 'require_approval' => true, 'timeout' => -1, ], + 'membership' => [ + 'single_membership' => false, + ], ], -]; \ No newline at end of file +]; diff --git a/locale/en_US/messages.php b/locale/en_US/messages.php index 8abf378..abad74d 100644 --- a/locale/en_US/messages.php +++ b/locale/en_US/messages.php @@ -110,8 +110,10 @@ return [ 'VIEW_DELETED' => 'View deleted', 'DELETED' => 'Deleted', - 'RETURN' => 'Return', + + 'JOIN' => 'Join', + 'LEAVE' => 'Leave', 'ACTION_CANNOT_UNDONE' => 'This action cannot be undone!', ]; diff --git a/src/Twig/OrganisationsExtension.php b/src/Twig/OrganisationsExtension.php index b2ac3ee..c825c62 100644 --- a/src/Twig/OrganisationsExtension.php +++ b/src/Twig/OrganisationsExtension.php @@ -77,6 +77,10 @@ class OrganisationsExtension extends AbstractExtension implements GlobalsInterfa public function getGlobals() { - return []; + $config = $this->services->config['organisation']; + + return [ + 'organisationConfig' => $config + ]; } } diff --git a/templates/tables/organisations.html.twig b/templates/tables/organisations.html.twig index 46cb309..4f77757 100644 --- a/templates/tables/organisations.html.twig +++ b/templates/tables/organisations.html.twig @@ -18,6 +18,7 @@ {{translate("ORGANISATION.MEMBER_COUNT")}} {{translate("ORGANISATION.ADMIN_COUNT")}} {% endif %} + {{translate("JOIN")}}/{{translate("LEAVE")}} {{translate("ACTIONS")}} @@ -88,6 +89,30 @@ + + {% endverbatim %}{% if hasRole('site-admin') or hasRole('organisations-admin') %}{% verbatim %}