Commit graph

180 commits

Author SHA1 Message Date
Rebecca Hsieh
9cc44d4d70
Fix logic for only admin 2024-10-24 17:13:18 -07:00
Rebecca Hsieh
6bf34c8d3b
Fix the logic for in progress user within a portfolio 2024-10-24 16:33:26 -07:00
Rebecca Hsieh
cd517ae885
Add in checks for if theyre only admin or have any in progress requests 2024-10-24 16:22:47 -07:00
Rebecca Hsieh
199f669fad
Try to add domain counting logic 2024-10-21 16:42:02 -07:00
Rebecca Hsieh
298e81d269
Attempt of adding tests 2024-10-01 11:49:16 -07:00
Rebecca Hsieh
8b8c176b0c
Biz logic 2024-10-01 07:27:19 -07:00
David Kennedy
7e3a2266a2
initial implementation 2024-09-20 16:27:39 -04:00
zandercymatics
4124ad113f
Merge branch 'main' into rjm/2351-org-requests-page 2024-09-12 14:18:37 -06:00
zandercymatics
b25a441838
Merge pull request #2708 from cisagov/za/2671-show-portfolios-on-user-table
Ticket #2671: Show portfolios on user table
2024-09-12 13:02:54 -06:00
zandercymatics
fbabd2029c
Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script 2024-09-10 14:25:59 -06:00
zandercymatics
9e7fa80bd0
Update user.py 2024-09-09 13:07:01 -06:00
zandercymatics
c5c3043eaa
Update user.py 2024-09-09 13:05:37 -06:00
zandercymatics
3955d5648f
Update user.py 2024-09-09 13:05:13 -06:00
zandercymatics
743f81aa90
Fix tests + lint 2024-09-09 10:06:07 -06:00
zandercymatics
6f1adc1573
Change waffle flag logic (merge conflict) 2024-09-09 09:07:50 -06:00
zandercymatics
847bcbe9b7
Merge branch 'main' into rjm/2351-org-requests-page 2024-09-09 08:47:34 -06:00
zandercymatics
2f5f09a0a0
Merge branch 'main' into rjm/2351-org-requests-page 2024-09-09 08:38:41 -06:00
zandercymatics
d1b4054f0f
Merge branch 'main' into dk/2667-waffle-flags-org 2024-09-09 08:23:08 -06:00
David Kennedy
604da37de3
merge 2024-09-06 17:31:57 -04:00
David Kennedy
9f557fc1e1
requests_json tests and some linting 2024-09-06 17:27:56 -04:00
Rachid Mrad
73e3ced96a
merge main 2024-09-06 13:51:18 -04:00
Rachid Mrad
1e9ae7befc
cleanup 2024-09-06 13:46:52 -04:00
zandercymatics
de76577384
Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script 2024-09-06 09:29:09 -06:00
David Kennedy
faf57902f0
filter requests based on permissions, updated actions based on permissions 2024-09-05 19:22:31 -04:00
zandercymatics
9d4ab22dc4
fix unit test 2024-09-05 08:53:37 -06:00
Rachid Mrad
d802b51dc4
unit tests and lint 2024-09-04 14:38:58 -04:00
David Kennedy
dd1b923404
wip 2024-09-04 13:41:26 -04:00
zandercymatics
82cd91d923
add portfolios view 2024-09-03 14:46:12 -06:00
Rachid Mrad
2af57c8aa8
Revise for multiple portfolios 2024-08-30 17:21:04 -04:00
Rachid Mrad
fc2f4f08cc
Merge main 2024-08-30 14:51:23 -04:00
Rachid Mrad
e1e812c5c7
Fix portfolio transfer 2024-08-30 11:51:24 -04:00
zandercymatics
061a0961fb
Create skeleton 2024-08-28 14:10:21 -06:00
zandercymatics
89c2e4543a
Update src/registrar/models/user.py
Co-authored-by: Matt-Spence <matthewswSpence@gmail.com>
2024-08-27 12:27:35 -06:00
David Kennedy
833b698bf2
adding request to a few flag_is_active instances 2024-08-21 17:52:02 -04:00
zandercymatics
aa872d6e41
Fix last test and lint 2024-08-21 12:22:03 -06:00
Rachid Mrad
e82326346c
clean up roles logic 2024-08-21 12:43:38 -04:00
Rachid Mrad
eb061be71b
Django admin portfolio members section 2024-08-21 12:25:27 -04:00
zandercymatics
ba2add8bc8
Fix redirect bug and fix permission issue 2024-08-21 09:42:31 -06:00
zandercymatics
729ce4c9f7
Replace inline if with .get
Not sure why I was doing that
2024-08-21 08:46:47 -06:00
zandercymatics
4f4dac2728
Add better error handling on session["portfolio"]
This was causing an error on some functions where request can be None, like our csv exports
2024-08-21 08:42:05 -06:00
zandercymatics
381ac49487
lint pt 2 2024-08-20 14:58:51 -06:00
zandercymatics
a362c2ef6c
Linting 2024-08-20 14:53:16 -06:00
David Kennedy
3c89557976
wip 2024-08-20 15:29:28 -04:00
zandercymatics
432ee9c860
pt. 1 of test refactors 2024-08-19 15:18:54 -06:00
zandercymatics
f587a994f2
cleanup 2024-08-19 12:26:14 -06:00
zandercymatics
289099dd92
Clean logic 2024-08-19 10:47:13 -06:00
zandercymatics
28a7d7bee2
invitation logic pt 2 2024-08-19 10:28:13 -06:00
zandercymatics
3e024f4ed0
Update user.py 2024-08-16 15:17:42 -06:00
zandercymatics
1090d75f75
Refactor fields using portfolio 2024-08-16 15:05:30 -06:00
zandercymatics
e03e6f7d35
Add permission table 2024-08-16 14:57:51 -06:00