Commit graph

191 commits

Author SHA1 Message Date
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
David Kennedy
334b6eac38
commented 2024-08-12 15:29:15 -04:00
David Kennedy
bea53019a5
added clean method which performs validation on user model 2024-08-12 15:28:02 -04:00
zandercymatics
bd615a18a2
Merge branch 'main' into za/2352-portfolio-user-can-view-and-update-suborgs 2024-08-09 13:31:30 -06:00
zandercymatics
f339266bd0
Update user.py 2024-08-06 08:07:19 -06:00
zandercymatics
b59f77b833
Merge branch 'main' into za/2348-csv-export-org-member-domain-export 2024-08-05 12:32:02 -06:00
zandercymatics
9c800e1f1d
Linting cleanup 2024-08-05 12:23:49 -06:00
zandercymatics
03e184e261
Add readonly view 2024-08-02 14:38:45 -06:00
zandercymatics
7b811895b3
Merge branch 'main' into za/2352-portfolio-user-can-view-and-update-suborgs 2024-08-02 13:41:34 -06:00
Rachid Mrad
226696ddcb
merge main - again 2024-08-02 14:05:40 -04:00
zandercymatics
22bdb1d3b0
More content 2024-08-02 11:40:18 -06:00
Rachid Mrad
c8797e77dd
merge main 2024-08-02 13:12:02 -04:00
zandercymatics
2769a9e5ba
Fix merge conflicts 2024-08-02 09:05:47 -06:00
Rachid Mrad
3e70b344e3
cleanup 2024-08-01 14:26:13 -04:00
zandercymatics
86f040e4b7
Reapply "Merge branch 'main' into za/2348-csv-export-org-member-domain-export"
This reverts commit 8becad8186.
2024-08-01 09:53:59 -06:00
zandercymatics
8becad8186
Revert "Merge branch 'main' into za/2348-csv-export-org-member-domain-export"
This reverts commit 4118bf17f9, reversing
changes made to 7eba6b721d.
2024-08-01 08:58:38 -06:00
zandercymatics
4118bf17f9
Merge branch 'main' into za/2348-csv-export-org-member-domain-export 2024-08-01 08:53:54 -06:00
Rachid Mrad
70d30f9cee
fix unit tests 2024-08-01 08:52:02 -04:00
Rachid Mrad
53a419a25e
merge main 2024-08-01 08:23:59 -04:00
Rachid Mrad
8f84f33756
portfolio invitation model 2024-07-31 20:34:34 -04:00
zandercymatics
117c7e0c42
Rebase logic 2024-07-31 11:55:50 -06:00
zandercymatics
a0bfdbf2b1
Merge branch 'za/bugfix-hide-csv-export-button-on-empty' into za/2348-csv-export-org-member-domain-export 2024-07-31 11:16:32 -06:00
zandercymatics
280f7cbc1b
Add logic 2024-07-31 11:02:18 -06:00
Rachid Mrad
6a94da8a5d
cleanup 2024-07-30 20:22:53 -04:00
Rachid Mrad
867ccd097e
remove migration 2024-07-30 20:21:41 -04:00
Rachid Mrad
7f212edda5
revert some of the tweaks 2024-07-30 19:58:39 -04:00
zandercymatics
558207d1aa
Update user.py 2024-07-30 14:43:25 -06:00
zandercymatics
511f545f26
Clamp to perms 2024-07-30 14:39:50 -06:00
Rachid Mrad
ee18be87c7
use css for read only styles 2024-07-30 11:39:48 -04:00
David Kennedy
658e7c98a7
initial working code 2024-07-24 22:28:34 -04:00
David Kennedy
ed50709fe3
small change to permission 2024-07-23 10:44:11 -04:00
David Kennedy
f96d9bcf3c
a few changes post merge 2024-07-23 09:29:44 -04:00
Rachid Mrad
faddfcec50
merge main 2024-07-22 15:39:46 -04:00
Rachid Mrad
5ed4581e21
revisions 2024-07-22 15:20:54 -04:00
Rachid Mrad
d8fce10016
merge main 2024-07-18 16:31:10 -04:00
David Kennedy
e9ba08f20a
small refactor 2024-07-18 13:48:27 -04:00
Rachid Mrad
cb3b1fd7fa
lint 2024-07-17 21:12:16 -04:00
Rachid Mrad
ea6ccae948
unit tests 2024-07-17 21:04:59 -04:00
Rachid Mrad
72ee81a43c
handle DJA ui and handle permission test for UserDomainRole 2024-07-17 15:38:38 -04:00
Rachid Mrad
777be646a4
working permissions 2024-07-17 13:57:04 -04:00