 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 |
|
|
bwilliams
|
6039574d79
|
Add a mapping model which can be used as an owner for approval tokens
|
2022-02-15 16:31:09 +00:00 |
|
|
bwilliams
|
62cc5713f7
|
Add an approved flag to the organisation members map table (pending "join organisation" workflow)
|
2022-02-15 16:26:06 +00:00 |
|
|
bwilliams
|
8dc120ae15
|
Change actions button depending on site/orgs admin vs organisation administrator
|
2022-02-15 15:50:42 +00:00 |
|
|
bwilliams
|
a02b4b52a0
|
Added foreign key to registrant_id
|
2022-02-15 15:50:01 +00:00 |
|
|
bwilliams
|
abe208bc50
|
Fixed nulled organisation name
|
2022-02-15 15:49:47 +00:00 |
|
|
bwilliams
|
d31bdd9970
|
Fixed backwards logic of cancellation requests
|
2022-02-15 15:47:01 +00:00 |
|
|
bwilliams
|
cd8a16f4a8
|
Revamped the organisation approvals process & refactored some files
|
2022-02-15 15:26:56 +00:00 |
|
|
bwilliams
|
e029728d69
|
Allow reverting a completed token to an un-complete state (undo "deny" scenario)
|
2022-02-15 14:56:45 +00:00 |
|
|
bwilliams
|
6cb5d759b4
|
Fixed the flag_approved down migration
|
2022-02-15 12:53:50 +00:00 |
|
|
bwilliams
|
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 |
|
|
bwilliams
|
512e13f57e
|
Fix leave organisation uri
|
2022-02-14 14:26:29 +00:00 |
|
|
bwilliams
|
8b17d63d95
|
Fixed typo and missing tag in email
|
2022-02-11 13:39:42 +00:00 |
|
|
bwilliams
|
f4fba338c5
|
When restoring an organisation that was rejected, revert the approval request as well
|
2022-02-11 13:38:24 +00:00 |
|
|
bwilliams
|
016f7489c4
|
Change language from Reject to Deny
|
2022-02-11 13:37:55 +00:00 |
|
|
bwilliams
|
da89a688b9
|
Replaced generic with an even more generic
|
2022-02-11 12:51:45 +00:00 |
|
|
bwilliams
|
cd947ba161
|
Jiggled the config file a little bit
|
2022-02-11 11:17:59 +00:00 |
|
|
bwilliams
|
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 |
|
|
bwilliams
|
ea0999b1fa
|
Fixed incorrect table name in migration
|
2022-02-11 10:56:37 +00:00 |
|
|
bwilliams
|
f530c85964
|
Even more permission lockdowns
|
2022-02-11 09:36:45 +00:00 |
|
|
bwilliams
|
c6c69b773b
|
Fix twig functions (master overrides permission)
|
2022-02-10 18:14:54 +00:00 |
|
|
bwilliams
|
575aa68bca
|
Tighten some more permissions down
|
2022-02-10 18:11:42 +00:00 |
|
|
bwilliams
|
909b6a93dc
|
Tighten some edit permissions on organisations
|
2022-02-10 17:54:56 +00:00 |
|
|
bwilliams
|
d00694f9cb
|
Hide slug from non-admin editers
|
2022-02-10 17:54:36 +00:00 |
|
|
bwilliams
|
95f198487a
|
Fixed cancel registration uri
|
2022-02-10 17:54:25 +00:00 |
|
|
bwilliams
|
005739e51b
|
Fixed broken member/admin counts on organisation page
|
2022-02-10 17:22:34 +00:00 |
|
|
bwilliams
|
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 |
|
|
bwilliams
|
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 |
|
|
bwilliams
|
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 |
|
|
bwilliams
|
97300ab8a5
|
Optimised Organisation model to prevent it running 4 extra queries per instance
|
2022-02-10 16:45:10 +00:00 |
|
|
bwilliams
|
1f0a47b244
|
Changed iconography on the organisations page
|
2022-02-10 15:53:18 +00:00 |
|
|
bwilliams
|
57dfed304f
|
Added functionality to permenently delete or restore deleted organisations
|
2022-02-10 15:52:57 +00:00 |
|
|
bwilliams
|
c3cf97ea50
|
Re-jigged some of the registration routes and modified the buttons/links to use them
|
2022-02-10 14:52:48 +00:00 |
|
|
bwilliams
|
7c319873b1
|
Add activity log messages for organisation approval workflow
|
2022-02-10 14:45:07 +00:00 |
|
|
bwilliams
|
01d4fdfa0b
|
Fixed links in the registration request email
|
2022-02-10 13:53:18 +00:00 |
|