Commit Graph

108 Commits

Author SHA1 Message Date
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
99add37bdd Replace the base authorization manager with an extended one with a runCallback method 2022-02-10 12:55:23 +00:00
6570f2fb27 Added an approved flag to organisations with a status column as an indicator, pending registration/approval workflow 2022-02-10 12:51:29 +00:00
a42b04f518 Fixed organisation sprunje name 2022-02-10 12:33:49 +00:00
a15482b71a Fixed the leave button data-slug parameter missing 2022-02-10 12:32:22 +00:00
ca4eb434ad Added missing dependencies to the OrgMembers migration 2022-02-10 12:31:03 +00:00
dbef49ed6e Fixed the route name for the organisation page 2022-02-10 12:29:43 +00:00
9d84dcec67 Fixed users being duplicated if they already existed in a target group during a merge 2022-02-10 10:30:31 +00:00
711968df08 Allow members to leave organisations 2022-02-09 12:34:30 +00:00
00128aff5d Because organisations are soft deleted, remove the "cannot undo" message on delete confirm 2022-02-09 11:28:43 +00:00
2b25f390d7 Hard delete merged organisations 2022-02-09 11:02:22 +00:00
27eb4ef754 Fix multiple rows per user appearing when using filters/sorts 2022-02-08 18:10:37 +00:00
9d62749914 Provide ability for admins to manage user organisation membership & admin rights
- Required overwriting a bunch of base code to slot in the handling
- Admins are shown with yellow text in their organisation label
2022-02-08 18:10:20 +00:00
609454def2 Fixed bug with initial sidebar state unknown 2022-02-08 16:32:42 +00:00
c9a0368642 Change organisations icon to differ from groups 2022-02-08 16:17:21 +00:00
b3c51527a0 Allow users to see their own organisation pages 2022-02-08 16:13:43 +00:00
2d701760c3 Added permission for organisations admin to see individual organisations pages 2022-02-08 09:48:23 +00:00
8b2089fede Updated viewable and editable organisation fields 2022-02-08 09:47:43 +00:00
9345bed087 Fixed missing apostrophe in seed condition 2022-02-08 09:43:50 +00:00
76442dbd4c Fixed organisation permission seeds & added an organisations admin role 2022-02-08 09:36:06 +00:00
4bd115ba4d Fixed merge_organisations permission check 2022-02-08 09:34:26 +00:00
19afb760a1 Fix handling of existing organisation name/slug clashes 2022-02-08 09:34:09 +00:00
7353801ca9 Organisations are now soft-deleted 2022-02-08 09:33:40 +00:00
9e23fdfdae Merge branch 'refs/heads/hotfix' 2022-02-07 16:24:32 +00:00
693b560352 Fixed missing reference 2022-02-07 16:24:27 +00:00
28255e315a Added capability to merge organisations
- Added an interface for organisation
- Added beforeDelete and beforeMerge callbacks
- Added hard/soft delete to organisations
2022-02-07 16:20:30 +00:00
b6edcf03e8 Update the member count column to exclude admins rather than include 2022-02-07 15:21:50 +00:00
ae0c884e44 Split organisation member management out of the organisation controller into a sub-controller 2022-02-07 12:04:10 +00:00
feaf3d5813 Added organisation information page 2022-02-07 11:23:32 +00:00
1edd850170 Added organisation members table & associated table column data 2022-02-04 13:58:44 +00:00