Commit Graph
100 Commits
Author SHA1 Message Date
bwilliams 1e0f2017f6 Fixed static function trait 2023-08-23 08:39:10 +01:00
bwilliams cd12ac72c7 Fixed Info column filter 2023-07-25 16:47:42 +01:00
bwilliams 0f5140d01f Simplified the organisation column permissions for now 2023-07-18 13:29:34 +01:00
bwilliams 85b1cec060 Added a has_organisation authorizer check 2023-07-18 13:28:50 +01:00
bwilliams 7f9d329295 Fixed sidebar block 2023-07-18 13:27:42 +01:00
bwilliams b54945cad6 Moved the organisation actions menu into blocks 2023-06-07 15:02:46 +01:00
bwilliams 522718f7ee Re-built organisation permissions 2023-06-07 13:41:14 +01:00
bwilliams 0ca0f83ac4 Removed dependency on blockier-templates 2023-06-07 13:29:24 +01:00
bwilliams fe03ad58af Removed namespace that is not used 2023-06-07 13:29:11 +01:00
bwilliams 577ebd0377 Fix findUnique issues 2023-06-07 13:28:58 +01:00
bwilliams 58a1b2d316 No longer need to override authorization manager 2023-06-07 11:12:32 +01:00
bwilliams de85fd6e47 Replaced "can_admin_via_orgs" auth check & added an explicit flag to the members check 2023-06-06 15:52:54 +01:00
bwilliams 85175f2ead Show/hide columns programatically 2023-06-06 15:51:06 +01:00
bwilliams 3a097fabca Use specific permission for showing deleted organisations button 2023-06-06 15:50:36 +01:00
bwilliams 8ee58f53be Removed blockier-templates dependency 2023-06-06 15:50:18 +01:00
bwilliams 6afe2e0be4 Added organisations to account settings 2023-06-06 15:49:23 +01:00
bwilliams fc47f23615 Added link to organisations from user menu 2023-06-06 15:49:09 +01:00
bwilliams b7d15dc25e Removed hasRole twig function 2023-06-06 15:48:53 +01:00
bwilliams 3d21ab4950 Removed token logger service 2023-06-06 15:48:37 +01:00
bwilliams d9d7bfdd3c Fixed locale typo 2023-06-06 15:48:05 +01:00
bwilliams 5bbceeac9a Change table template hierarchy structure 2023-06-06 15:10:02 +01:00
bwilliams b8cb04cd14 Abstract the organisation form and sidebar menu 2023-06-06 15:09:14 +01:00
bwilliams cbf6b916c3 Moved the BasicTokenRepository code to UFTweaks 2023-06-06 15:08:31 +01:00
bwilliams c99a277e2a Added an administrator fallback banner to organisation join approval emails 2022-11-14 16:54:52 +00:00
bwilliams 5a0906eb43 Organisation admins can view the user pages of their members 2022-05-19 16:45:13 +01:00
bwilliams a820fb56e0 Moved auditer into a sprinkle of it's own 2022-05-19 16:44:21 +01:00
bwilliams a61231e977 Re-arranged the dashboard page 2022-05-19 15:04:50 +01:00
bwilliams 417955d07e Changed the organisation navigation menu slightly to better handle single organisation mode 2022-05-19 15:04:34 +01:00
bwilliams cf5247aa66 Fix filtering of name/description (case in-sensitive) 2022-03-15 12:18:13 +00:00
bwilliams 1fe9cba239 Fixed nesting of sprunje where clause 2022-03-15 12:17:40 +00:00
bwilliams d4126593c6 Updates to admin dashboard template 2022-03-11 12:53:15 +00:00
bwilliams 38c57d463f Don't redirect when editing an organisation name/slug 2022-03-08 16:54:34 +00:00
bwilliams 05942afd61 Fixed permission for editing name of organisation 2022-03-08 16:52:51 +00:00
bwilliams a07ec92546 Join requests now present an "are you sure?" modal 2022-03-08 16:11:09 +00:00
bwilliams 52b5a880b2 Added some extra checks to ensure the user is not already in the organisation they are attempting to join 2022-03-08 15:35:22 +00:00
bwilliams 340413ff38 Allow editable fields to be selected by permission 2022-03-08 15:16:54 +00:00
bwilliams cd5afda21b Don't run the default permissions seed (it wipes existing permissions) 2022-03-08 15:04:55 +00:00
bwilliams 561110663b Update sidebar code 2022-03-08 13:38:25 +00:00
bwilliams 2077d1723c Use line clamp to restrict to 5 lines & move the remove button to the same height as the org name 2022-03-08 13:38:11 +00:00
bwilliams 45a4591f73 Added organisations to users page 2022-03-08 13:13:20 +00:00
bwilliams 012b633eaf Update the dashboard with an organisations widget 2022-03-07 16:27:52 +00:00
bwilliams 2005a17eef Corrected spelling of permission 2022-03-07 12:34:54 +00:00
bwilliams 5e6c66df3c Further permission tweaks 2022-03-07 12:13:28 +00:00
bwilliams 7206bfc851 Tweaks to permissions 2022-03-07 12:06:41 +00:00
bwilliams d98d6ddd1b Fix a permission bug 2022-03-07 11:16:01 +00:00
bwilliams 85da5e4f78 Blockier templates table structure 2022-03-05 18:19:31 +00:00
bwilliams ab530e71a1 Switch to using a trait to hold the user organisation stuff 2022-03-05 17:26:23 +00:00
bwilliams 299a6709cd De-conflict asset bundles 2022-03-05 17:22:25 +00:00
bwilliams 5cf22b1715 Add (Admin) flag to members table 2022-03-02 15:51:42 +00:00
bwilliams 8d0d097f15 Remove phone numbers from org permissions (not in this branch) 2022-03-02 15:43:16 +00:00
bwilliams f210f4d101 Allow approving/denying organisations without tokens (admin override) 2022-03-02 15:35:39 +00:00
bwilliams 868cd1a9ae Fixed some more permissions 2022-03-02 15:35:08 +00:00
bwilliams 9a0fc3f3bd Fixed promotion/demotion permission check 2022-03-02 15:34:39 +00:00
bwilliams d5526083dd Fixed deleted orgs table 2022-03-02 10:53:46 +00:00
bwilliams be0ae74431 Fix postgresql DISTINCT problems 2022-03-02 09:46:20 +00:00
bwilliams d6f134e1e9 Organisation admins can now promote/demote members/admins 2022-03-01 14:59:56 +00:00
bwilliams 6b7e7cd53b Fixed "remove member" bug 2022-02-28 11:31:07 +00:00
bwilliams 001559ed12 Previous method didn't work, use new method 2022-02-28 11:19:16 +00:00
bwilliams 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
bwilliams 0aeebffdc7 Show member join status in the members table 2022-02-28 11:12:27 +00:00
bwilliams 2fe8c7fd16 Fixed dependency 2022-02-28 10:24:53 +00:00
bwilliams 55941fbd21 Fixed disabled sorting by organisations column 2022-02-22 18:12:21 +00:00
bwilliams 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
bwilliams 5456902f77 Beta version of migration scripts 2022-02-22 16:40:39 +00:00
bwilliams 3490f7c6f1 Removed table specific id string part and replaced it with the provided {{table.id}} 2022-02-22 15:29:11 +00:00
bwilliams 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
bwilliams 96e861e7fe Hide some administration columns for basic organisation users (Fixes #3) 2022-02-22 13:52:53 +00:00
bwilliams 0d5551f927 Fix the user-manage-organisations modal (column name & search) 2022-02-22 13:48:20 +00:00
bwilliams 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
bwilliams e825050814 Fixed incorrect counts due to the left-join 2022-02-22 13:18:23 +00:00
bwilliams 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
bwilliams 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
bwilliams 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
bwilliams 16555bfafb Missed a blockier templates extension 2022-02-22 11:01:12 +00:00
bwilliams db19560e45 Fixes #2 2022-02-22 10:44:42 +00:00
bwilliams 940d5b0d2f Fixed postgres complaint about integer = boolean comparison (I hope!) 2022-02-21 17:54:33 +00:00
bwilliams e58f514896 Use blockier-templates 2022-02-21 16:13:28 +00:00
bwilliams 7023025fdc Provided text for a button tooltip 2022-02-18 10:17:41 +00:00
bwilliams 506dbad7ae Made a validation schema more generic 2022-02-18 10:17:23 +00:00
bwilliams 77d283f0c1 Add some blocks to make extending easier 2022-02-17 18:43:20 +00:00
bwilliams 23e6608af3 Fixed some text in membership emails 2022-02-17 18:36:48 +00:00
bwilliams ebaffe3d98 Modified a log string and made a protected method public (should of been public anyway) 2022-02-17 18:36:26 +00:00
bwilliams e9a1ac2018 Fixed bug preventing admin leaving organisation 2022-02-17 18:35:54 +00:00
bwilliams 2da722f84e Fix member count column wrapping wierdly 2022-02-15 17:59:09 +00:00
bwilliams 275dd757b6 Change "pending" organisation registrations to yellow (amber) instead of red 2022-02-15 17:58:49 +00:00
bwilliams 0145296493 Fixed showing pending join requests in "My Organisations" menu 2022-02-15 17:57:57 +00:00
bwilliams 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
bwilliams 108a34481e Fixed is_member access right from granting pending members permission 2022-02-15 17:56:26 +00:00
bwilliams 5c8cf6778c Fixed permission for org admins to accept/reject join requests 2022-02-15 17:55:57 +00:00
bwilliams 2dbd11ef28 Refactored the organisation members controller - includes a permissions fix 2022-02-15 17:43:24 +00:00
bwilliams 800ac93ecf Fixed organisation approve authorisations & redirects 2022-02-15 17:31:58 +00:00
bwilliams 64971d6262 Change leave redirect to organisations list page if access is granted, dashboard if otherwise 2022-02-15 17:31:29 +00:00
bwilliams b042402681 Fixed missing class error 2022-02-15 17:10:38 +00:00
bwilliams e63b03fb2b Don't show organisations pending a join request in the navbar 2022-02-15 17:01:41 +00:00
bwilliams 77da13e0a0 Fixed button states 2022-02-15 16:58:39 +00:00
bwilliams 3735e1e9ce Added functionality to join organisations and the optional approval process 2022-02-15 16:53:23 +00:00
bwilliams 130c5ec9bb Added buttons to join/leave organisations (no functionality yet) 2022-02-15 16:52:00 +00:00
bwilliams e2180ddff3 Tweaked the organisations fields to change how is_member behaves and added an is_pending 2022-02-15 16:40:10 +00:00
bwilliams 7e2a6d1379 Created requested, accepted and rejected email templates for requests 2022-02-15 16:37:22 +00:00
bwilliams 8d762c5dca Created a membership approval token repository and required token table & model 2022-02-15 16:36:54 +00:00