Commit Graph

109 Commits

Author SHA1 Message Date
96e861e7fe Hide some administration columns for basic organisation users (Fixes #3) 2022-02-22 13:52:53 +00:00
0d5551f927 Fix the user-manage-organisations modal (column name & search) 2022-02-22 13:48:20 +00:00
be8404c9a5 Split pending organisations into a separate list and default to only returning organisations a user is an accepted member of (Fixes #1) 2022-02-22 13:47:44 +00:00
e825050814 Fixed incorrect counts due to the left-join 2022-02-22 13:18:23 +00:00
e62e71ab6c Fix page redirect after changing an organisation name (slug) from the organisation info page (Fixes #9) 2022-02-22 11:43:48 +00:00
5f8e922438 Changed the styling of organisation labels (Fixes #5)
- Admins are green
- Members are white
- Pending members are yellow
- Pending organisations are grey background
2022-02-22 11:25:32 +00:00
e92b80fbe1 Prevent users from creating more than 1 or being a member of more than 1 organisation in single organisation configuration (Fixes #7) 2022-02-22 11:02:16 +00:00
16555bfafb Missed a blockier templates extension 2022-02-22 11:01:12 +00:00
db19560e45 Fixes #2 2022-02-22 10:44:42 +00:00
940d5b0d2f Fixed postgres complaint about integer = boolean comparison (I hope!) 2022-02-21 17:54:33 +00:00
e58f514896 Use blockier-templates 2022-02-21 16:13:28 +00:00
7023025fdc Provided text for a button tooltip 2022-02-18 10:17:41 +00:00
506dbad7ae Made a validation schema more generic 2022-02-18 10:17:23 +00:00
77d283f0c1 Add some blocks to make extending easier 2022-02-17 18:43:20 +00:00
23e6608af3 Fixed some text in membership emails 2022-02-17 18:36:48 +00:00
ebaffe3d98 Modified a log string and made a protected method public (should of been public anyway) 2022-02-17 18:36:26 +00:00
e9a1ac2018 Fixed bug preventing admin leaving organisation 2022-02-17 18:35:54 +00:00
2da722f84e Fix member count column wrapping wierdly 2022-02-15 17:59:09 +00:00
275dd757b6 Change "pending" organisation registrations to yellow (amber) instead of red 2022-02-15 17:58:49 +00:00
0145296493 Fixed showing pending join requests in "My Organisations" menu 2022-02-15 17:57:57 +00:00
2ba0257b6e Add a new twig function for checking if a user is an organisation registrant (the only one able to cancel a register request) 2022-02-15 17:57:36 +00:00
108a34481e Fixed is_member access right from granting pending members permission 2022-02-15 17:56:26 +00:00
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