187 Commits

Author SHA1 Message Date
5c8cf6778c Fixed permission for org admins to accept/reject join requests 2022-02-15 17:55:57 +00:00
2dbd11ef28 Refactored the organisation members controller - includes a permissions fix 2022-02-15 17:43:24 +00:00
800ac93ecf Fixed organisation approve authorisations & redirects 2022-02-15 17:31:58 +00:00
64971d6262 Change leave redirect to organisations list page if access is granted, dashboard if otherwise 2022-02-15 17:31:29 +00:00
b042402681 Fixed missing class error 2022-02-15 17:10:38 +00:00
e63b03fb2b Don't show organisations pending a join request in the navbar 2022-02-15 17:01:41 +00:00
77da13e0a0 Fixed button states 2022-02-15 16:58:39 +00:00
3735e1e9ce Added functionality to join organisations and the optional approval process 2022-02-15 16:53:23 +00:00
130c5ec9bb Added buttons to join/leave organisations (no functionality yet) 2022-02-15 16:52:00 +00:00
e2180ddff3 Tweaked the organisations fields to change how is_member behaves and added an is_pending 2022-02-15 16:40:10 +00:00
7e2a6d1379 Created requested, accepted and rejected email templates for requests 2022-02-15 16:37:22 +00:00
8d762c5dca Created a membership approval token repository and required token table & model 2022-02-15 16:36:54 +00:00
6039574d79 Add a mapping model which can be used as an owner for approval tokens 2022-02-15 16:31:09 +00:00
62cc5713f7 Add an approved flag to the organisation members map table (pending "join organisation" workflow) 2022-02-15 16:26:06 +00:00
8dc120ae15 Change actions button depending on site/orgs admin vs organisation administrator 2022-02-15 15:50:42 +00:00
a02b4b52a0 Added foreign key to registrant_id 2022-02-15 15:50:01 +00:00
abe208bc50 Fixed nulled organisation name 2022-02-15 15:49:47 +00:00
d31bdd9970 Fixed backwards logic of cancellation requests 2022-02-15 15:47:01 +00:00
cd8a16f4a8 Revamped the organisation approvals process & refactored some files 2022-02-15 15:26:56 +00:00
e029728d69 Allow reverting a completed token to an un-complete state (undo "deny" scenario) 2022-02-15 14:56:45 +00:00
6cb5d759b4 Fixed the flag_approved down migration 2022-02-15 12:53:50 +00:00
091febf255 Created an implementation of a token repository that isn't restricted to users and can be re-used for other objects. 2022-02-15 12:53:31 +00:00
512e13f57e Fix leave organisation uri 2022-02-14 14:26:29 +00:00
8b17d63d95 Fixed typo and missing tag in email 2022-02-11 13:39:42 +00:00
f4fba338c5 When restoring an organisation that was rejected, revert the approval request as well 2022-02-11 13:38:24 +00:00
016f7489c4 Change language from Reject to Deny 2022-02-11 13:37:55 +00:00
da89a688b9 Replaced generic with an even more generic 2022-02-11 12:51:45 +00:00
cd947ba161 Jiggled the config file a little bit 2022-02-11 11:17:59 +00:00
253d77668b Refactored organisation approval class to a base model which will soon be included in a membership approval class 2022-02-11 11:17:05 +00:00
ea0999b1fa Fixed incorrect table name in migration 2022-02-11 10:56:37 +00:00
f530c85964 Even more permission lockdowns 2022-02-11 09:36:45 +00:00
c6c69b773b Fix twig functions (master overrides permission) 2022-02-10 18:14:54 +00:00
575aa68bca Tighten some more permissions down 2022-02-10 18:11:42 +00:00
909b6a93dc Tighten some edit permissions on organisations 2022-02-10 17:54:56 +00:00
d00694f9cb Hide slug from non-admin editers 2022-02-10 17:54:36 +00:00
95f198487a Fixed cancel registration uri 2022-02-10 17:54:25 +00:00
005739e51b Fixed broken member/admin counts on organisation page 2022-02-10 17:22:34 +00:00
4d57f6d33e Allow non-admin users to see the organisations list (required for easier "Join" and "Register" requests). Filter the list to approved or memberOf organisations only. 2022-02-10 17:19:47 +00:00
c3e7c24e6d Add a scope to the organisation model to include if the currentUser is a member or admin of which organisations (null indicates not a member nor an admin) 2022-02-10 17:18:06 +00:00
f2c6677dc1 Order the user model's organisations alphabetically by default (this may break any other orderBy's) 2022-02-10 17:17:04 +00:00
97300ab8a5 Optimised Organisation model to prevent it running 4 extra queries per instance 2022-02-10 16:45:10 +00:00
1f0a47b244 Changed iconography on the organisations page 2022-02-10 15:53:18 +00:00
57dfed304f Added functionality to permenently delete or restore deleted organisations 2022-02-10 15:52:57 +00:00
c3cf97ea50 Re-jigged some of the registration routes and modified the buttons/links to use them 2022-02-10 14:52:48 +00:00
7c319873b1 Add activity log messages for organisation approval workflow 2022-02-10 14:45:07 +00:00
01d4fdfa0b Fixed links in the registration request email 2022-02-10 13:53:18 +00:00
59c970ad4f Re-indent translations 2022-02-10 13:02:09 +00:00
c2717be73b Added missing translation message 2022-02-10 13:02:01 +00:00
b64b4d72f9 Organisation registration process implemented with configurable approval workflow 2022-02-10 13:00:51 +00:00
fade1f8441 Created some twig extensions for checking membership using the new authorization manager callbacks 2022-02-10 12:56:18 +00:00