Commit Graph

18 Commits

Author SHA1 Message Date
cd8a16f4a8 Revamped the organisation approvals process & refactored some files 2022-02-15 15:26:56 +00:00
016f7489c4 Change language from Reject to Deny 2022-02-11 13:37:55 +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
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
b64b4d72f9 Organisation registration process implemented with configurable approval workflow 2022-02-10 13:00:51 +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
9d84dcec67 Fixed users being duplicated if they already existed in a target group during a merge 2022-02-10 10:30:31 +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
b3c51527a0 Allow users to see their own organisation pages 2022-02-08 16:13:43 +00:00
7353801ca9 Organisations are now soft-deleted 2022-02-08 09:33:40 +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
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
584aa1909e List existing organisations 2022-01-21 10:56:43 +00:00