Commit Graph

177 Commits

Author SHA1 Message Date
5cf22b1715 Add (Admin) flag to members table 2022-03-02 15:51:42 +00:00
8d0d097f15 Remove phone numbers from org permissions (not in this branch) 2022-03-02 15:43:16 +00:00
f210f4d101 Allow approving/denying organisations without tokens (admin override) 2022-03-02 15:35:39 +00:00
868cd1a9ae Fixed some more permissions 2022-03-02 15:35:08 +00:00
9a0fc3f3bd Fixed promotion/demotion permission check 2022-03-02 15:34:39 +00:00
d5526083dd Fixed deleted orgs table 2022-03-02 10:53:46 +00:00
be0ae74431 Fix postgresql DISTINCT problems 2022-03-02 09:46:20 +00:00
d6f134e1e9 Organisation admins can now promote/demote members/admins 2022-03-01 14:59:56 +00:00
6b7e7cd53b Fixed "remove member" bug 2022-02-28 11:31:07 +00:00
001559ed12 Previous method didn't work, use new method 2022-02-28 11:19:16 +00:00
1c4a71410d Allow manual override of accept/reject when there are no valid tokens (check to make sure this doesn't cause issues elsewhere...) 2022-02-28 11:15:02 +00:00
0aeebffdc7 Show member join status in the members table 2022-02-28 11:12:27 +00:00
2fe8c7fd16 Fixed dependency 2022-02-28 10:24:53 +00:00
55941fbd21 Fixed disabled sorting by organisations column 2022-02-22 18:12:21 +00:00
0dbfbef594 Added capability for organisation administrators to accept/reject join requests, remove members, edit their details and reset their passwords 2022-02-22 18:11:59 +00:00
5456902f77 Beta version of migration scripts 2022-02-22 16:40:39 +00:00
3490f7c6f1 Removed table specific id string part and replaced it with the provided {{table.id}} 2022-02-22 15:29:11 +00:00
f75bde0ccf Sorting by organisation on the users page is a bit broken because of the way the join is done so don't offer the capability to do it in the first place... 2022-02-22 13:53:26 +00:00
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