Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add COG children picker to forms #5279

Draft
wants to merge 46 commits into
base: issue-114-backend
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b45a031
Add COG children picker to forms
CarolineDenis Sep 17, 2024
85750a7
Chnage key
CarolineDenis Sep 17, 2024
b101753
Add useEffect to create newResource
CarolineDenis Sep 17, 2024
bb463de
Add search dialog
CarolineDenis Sep 17, 2024
ae68be1
Handle add
CarolineDenis Sep 17, 2024
f3bbf59
Typo
CarolineDenis Sep 17, 2024
51e0d44
Reset resource
CarolineDenis Sep 17, 2024
c94f559
Unhide geo tables
CarolineDenis Sep 17, 2024
551c99f
Merge remote-tracking branch 'origin/production' into issue-5185
CarolineDenis Oct 1, 2024
d2e7222
Remove unused localization
CarolineDenis Oct 1, 2024
1bfb08b
Merge branch 'issue-114-backend' into issue-5185
CarolineDenis Oct 4, 2024
1762ce3
Add cojo dialog to subview
CarolineDenis Oct 4, 2024
33a95dd
Merge remote-tracking branch 'origin/issue-114-backend' into issue-5185
CarolineDenis Oct 4, 2024
487949b
Lint code with ESLint and Prettier
CarolineDenis Oct 4, 2024
8c73db3
Merge remote-tracking branch 'origin/issue-114-backend' into issue-5185
CarolineDenis Oct 8, 2024
3a6805c
Check totalCount
CarolineDenis Oct 8, 2024
a99d6cc
Merge remote-tracking branch 'origin/issue-114-backend' into issue-5185
CarolineDenis Oct 14, 2024
a5f0425
Change child field
CarolineDenis Oct 14, 2024
5fe7956
Research and tries
CarolineDenis Oct 15, 2024
c60941f
Add parentUrl
CarolineDenis Oct 15, 2024
6c93b08
Handle mutliple COs added at same time
CarolineDenis Oct 16, 2024
3a274cf
Remove some comments
CarolineDenis Oct 16, 2024
f9d1303
Remove duplication
CarolineDenis Oct 16, 2024
6300e57
Remove log
CarolineDenis Oct 16, 2024
656518e
Remove import
CarolineDenis Oct 16, 2024
b4a910d
Merge remote-tracking branch 'origin/issue-114-backend' into issue-5185
CarolineDenis Oct 16, 2024
f411069
Set cojo on parent
CarolineDenis Oct 16, 2024
5add530
Remove code
CarolineDenis Oct 16, 2024
6c01746
Remove import
CarolineDenis Oct 17, 2024
9290602
Datamodel improvements
melton-jason Oct 17, 2024
9deb5ee
Merge branch 'issue-5185' of https://github.com/specify/specify7 into…
melton-jason Oct 17, 2024
e19d291
Remove unecessary code
CarolineDenis Oct 17, 2024
a3e4d35
Remove comment
CarolineDenis Oct 18, 2024
ee44f35
Remove condition
CarolineDenis Oct 18, 2024
d97d26e
Merge branch 'issue-114-backend' into issue-5185
melton-jason Oct 18, 2024
96d3993
Add field check for childCOJOs
CarolineDenis Oct 22, 2024
d6d03db
Add to do
CarolineDenis Oct 22, 2024
9354ab6
Merge remote-tracking branch 'origin/issue-114-backend' into issue-5185
CarolineDenis Oct 22, 2024
7faa4ff
Test setting parentCojo
CarolineDenis Oct 23, 2024
e845097
Merge remote-tracking branch 'origin/issue-114-backend' into issue-5185
CarolineDenis Oct 23, 2024
4450ab8
Merge remote-tracking branch 'origin/issue-114-backend' into issue-5185
sharadsw Oct 25, 2024
a97855a
Add cojo back to COG
sharadsw Oct 25, 2024
5a94c4f
Use children relationship for opening COJO dialog
sharadsw Oct 25, 2024
58c03c3
Remove unused import
sharadsw Oct 25, 2024
6c220a4
Save parentCojo on childCog
sharadsw Oct 25, 2024
40d55c1
Remove unused import
sharadsw Oct 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ LOG_LEVEL=WARNING
# should only be used during development and troubleshooting and not
# during general use. Django applications leak memory when operated
# continuously in debug mode.
SP7_DEBUG=true
SP7_DEBUG=true
7 changes: 6 additions & 1 deletion specifyweb/businessrules/rules/cojo_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,9 @@ def cojo_pre_save(cojo):
(Collectionobjectgroupjoin.objects
.filter(parentcog=cojo.parentcog)
.update(issubstrate=False))


@orm_signal_handler('post_save', 'Collectionobjectgroupjoin')
def cojo_post_save(cojo):
if cojo.childcog is not None:
cojo.childcog.parentcojo = cojo
cojo.childcog.save()
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ export const businessRuleDefs: MappedBusinessRuleDefs = {
},
},
},

Determination: {
fieldChecks: {
taxon: async (
Expand Down
Loading
Loading