Commit Graph

1169 Commits

Author SHA1 Message Date
richard-dds
3765a73dc1 Consolidate WorkspaceUser into WorkspaceRole 2018-11-05 14:20:07 -05:00
dandds
d78c6de386 Merge pull request #426 from dod-ccpo/invite-errors-#161347944
display error alert for users who had DOD ID conflict when accepting …
2018-11-05 14:03:01 -05:00
richard-dds
6a39ce2a52 Allow drafts to be saved without pe_number 2018-11-05 11:44:59 -05:00
patricksmithdds
a5617a86e3 Merge pull request #421 from dod-ccpo/update-uat-env
Update UAT environment
2018-11-05 09:56:25 -05:00
dandds
5fc9dbd177 display error alert for users who had DOD ID conflict when accepting workspace invitation 2018-11-05 09:42:13 -05:00
dandds
1d6de8e0ee Merge pull request #422 from dod-ccpo/invite-expiration
Invite and Workspace Member Status
2018-11-02 11:57:36 -04:00
richard-dds
5d4f867342 Correct attachment form field even if form is not extended 2018-11-02 11:52:22 -04:00
richard-dds
ff0c4ffb69 Fix a bug that was crashing the requests index 2018-11-01 15:51:21 -04:00
dandds
e4bad109db more granular invitation status and a display status for workspace members 2018-11-01 13:52:03 -04:00
richard-dds
97475ee64f WIP tests 2018-11-01 13:52:03 -04:00
richard-dds
f8e16a96d2 Determine member status based on invitations 2018-11-01 13:52:03 -04:00
richard-dds
5477076fe1 Formatting 2018-11-01 10:25:52 -04:00
richard-dds
d069897062 Allow filtering by all possible statuses 2018-11-01 10:25:52 -04:00
richard-dds
0494382d00 boolean filter is unnecessary. tojson works 2018-11-01 10:25:52 -04:00
richard-dds
ceab98c3cc Formatting 2018-11-01 10:25:52 -04:00
richard-dds
c5800a8c98 Vue-ify requests listing page 2018-11-01 10:25:52 -04:00
richard-dds
401a9e93a7 Merge pull request #412 from dod-ccpo/status-change-emails
Notify PSO or MO of request status change
2018-11-01 10:13:39 -04:00
Patrick Smith
4bbb55a06e Add RQ_QUEUES to default config
We can use string interpolation in the file rather than building it when
making the config. Adding the value to the config allows us to override
it with an environment variable, if we want to (as we do for the UAT
environment).
2018-10-31 16:12:00 -04:00
dandds
3a01b36d70 Merge pull request #418 from dod-ccpo/invited-user-#160301892
Invited user #160301892
2018-10-31 15:33:08 -04:00
dandds
c4b9ce6052 Merge pull request #420 from dod-ccpo/stock-user-updates
update dev users
2018-10-31 15:17:40 -04:00
leigh-mil
72f7a67cfc Merge pull request #417 from dod-ccpo/fix-manual-fin-ver-#161560975
Fix manual fin ver #161560975
2018-10-31 14:55:44 -04:00
dandds
43eeba2f96 remove TODO for checking user against invitation 2018-10-31 14:53:52 -04:00
dandds
cb25dcdd32 invitation cannot be reused if wrong user accepts it 2018-10-31 14:53:52 -04:00
dandds
0a176239b7 add home link to error page and catch missing template exception in glob route 2018-10-31 14:53:52 -04:00
dandds
87baa1f873 more fine-grained errors for invalid invitations 2018-10-31 14:53:52 -04:00
dandds
b3cd08a64f invitation can only be accepted by user with matching DOD ID 2018-10-31 14:53:51 -04:00
dandds
11ebc19673 update dev users 2018-10-31 14:49:10 -04:00
montana-mil
0ee47f5ac4 Merge pull request #408 from dod-ccpo/filter-by-status-and-role
Filter by status and role
2018-10-31 14:47:59 -04:00
Patrick Smith
4e08f6f3fa Formatting fix 2018-10-31 14:19:27 -04:00
patricksmithdds
0b44980ccb Merge branch 'master' into require-personal-info 2018-10-31 14:12:55 -04:00
Montana
64861d94c2 Formatting 2018-10-31 14:11:20 -04:00
Montana
b051e2a955 Use url_for for redirect link 2018-10-31 14:03:56 -04:00
Montana
3e1c813ceb Iterate over workspace roles to display available role filters 2018-10-31 14:03:56 -04:00
Montana
45d29977e1 Delete unused module 2018-10-31 14:03:56 -04:00
Montana
d3726d4ecc Display nice role names 2018-10-31 14:03:56 -04:00
Montana
c5856c539d Use Vue for template rendering 2018-10-31 14:03:56 -04:00
Montana
3de1e55440 Basic Vue function for search 2018-10-31 14:03:55 -04:00
Montana
dd3b6676d3 Fix __repr__ on workspace user model 2018-10-31 14:03:53 -04:00
richard-dds
06e03489b6 Move request edit link logic into its own route 2018-10-31 11:09:21 -04:00
dandds
3a5d8036a1 some cleanup for invitation changes 2018-10-31 10:21:48 -04:00
dandds
faa98fcb17 include auditable mixin in invitation 2018-10-31 10:21:48 -04:00
dandds
848bbf9c12 Updates to workspace role permissions, invitations 2018-10-31 10:21:48 -04:00
dandds
4c03a403f7 cleanup, add test for workspace user permissions 2018-10-31 10:21:48 -04:00
dandds
151d5be5ea use invite token instead of id for invitation url 2018-10-31 10:21:48 -04:00
dandds
b81a831c85 remove accepted column from workspace_roles 2018-10-31 10:21:48 -04:00
dandds
5c5f9c6c9c record expiration time on the invitation 2018-10-31 10:21:48 -04:00
dandds
d5998ed370 track invitation state by status enum 2018-10-31 10:21:48 -04:00
dandds
6125041a93 record inviter on invitation 2018-10-31 10:21:48 -04:00
dandds
edede87108 specify unit for invitation expiration 2018-10-31 10:21:48 -04:00
dandds
5c2d466049 workspace users who have not accepted invite should not have permissions 2018-10-31 10:21:48 -04:00