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.

Sign up for GitHub

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

Jump to bottom

[Django Upgrade] [ENG-4072] The Rest - Part 2 #10072

Merged
merged 12 commits into from
Oct 10, 2022
Merged

[Django Upgrade] [ENG-4072] The Rest - Part 2 #10072

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bfc5b8c
Fix missing or insufficient permission test for amdin preprints view
cslzchen Sep 29, 2022
b927676
Fix admin user view tests by using HTTP response headers object
cslzchen Sep 29, 2022
a61cd1b
Fix duplicate view_node permissions in node and instn view tests
cslzchen Sep 27, 2022
21bfede
Rework refresh_from_db() to reload GFKs
cslzchen Oct 3, 2022
ca45a2a
Fix visible contributor query
cslzchen Sep 30, 2022
0375a5a
Fix handle_archive_fail and its tests
cslzchen Sep 27, 2022
b3aa28d
Use a different schema to fix tests failure due to django3 upgrade
Sep 13, 2022
9b30044
Update URLs for URL Validation tests with Django 3
cslzchen Oct 3, 2022
75a99e2
Revert "Fix an issue where get_node() is not avaialbe from context view"
cslzchen Oct 4, 2022
b311d18
Improve to_internal_value() in NodeRelationshipField
cslzchen Oct 4, 2022
227ee3a
Add alt fixtures to prevent both siblings & parent/child conflicts
cslzchen Oct 4, 2022
16f7a3a
Fix linked_by_nodes in node related counts test
cslzchen Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion api/draft_registrations/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,18 @@
)
from api.taxonomies.serializers import TaxonomizableSerializerMixin
from osf.exceptions import DraftRegistrationStateError
from osf.models import Node
from website import settings


class NodeRelationshipField(RelationshipField):

def to_internal_value(self, node_id):
node = self.context['view'].get_node(node_id=node_id) if node_id else None
context_view = self.context['view']
if hasattr(context_view, 'get_node'):
node = self.context['view'].get_node(node_id=node_id) if node_id else None
else:
node = Node.load(node_id)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the upgrade, one test fails due to self.context['view'] returning an object not having .get_node. There is one concern of this fix since .get_node() checks permission and other stuff before loading the node. Might worth another look at the failed test.

return {'branched_from': node}


Expand Down