Skip to content

[WIP] [Draft] prevent draft_node convert_draft_node_to_node when registering #11736

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

Open
futa-ikeda wants to merge 1 commit into
base: feature/prevent-project-creation
Choose a base branch
from
+5 −5
Open

[WIP] [Draft] prevent draft_node convert_draft_node_to_node when registering #11736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 osf/models/archive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class ArchiveJob(ObjectIDMixin, BaseModel):
dst_node = models.ForeignKey('Registration', related_name='archive_jobs',
verbose_name='destination node', null=True,
blank=True, on_delete=models.CASCADE)
src_node = models.ForeignKey('Node', verbose_name='source node', null=True,
src_node = models.ForeignKey('AbstractNode', verbose_name='source node', null=True,
blank=True, on_delete=models.CASCADE)
initiator = models.ForeignKey('OSFUser', null=True, on_delete=models.CASCADE)

Expand Down
8 changes: 4 additions & 4 deletions osf/models/draft_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from framework.auth.core import Auth
from django.utils import timezone

from .node import AbstractNode, Node, NodeLog
from .node import AbstractNode, NodeLog
from osf.exceptions import NodeStateError


Expand All @@ -26,7 +26,7 @@ def set_privacy(self, permissions, *args, **kwargs):
raise NodeStateError('You may not set privacy for a DraftNode.')

def clone(self):
raise NodeStateError('A DraftNode may not be forked, used as a template, or registered.')
return super().clone()

# Overrides AbstractNode.update_search
def update_search(self):
Expand Down Expand Up @@ -68,9 +68,9 @@ def register_node(self, schema, auth, draft_registration, parent=None, child_ids
:param parent Node: parent registration of registration to be created
:param provider RegistrationProvider: provider to submit the registration to
"""
self.convert_draft_node_to_node(auth)
# self.convert_draft_node_to_node(auth)
# Copies editable fields from the DraftRegistration back to the Node
self.copy_editable_fields(draft_registration, save=True)

# Calls super on Node, since self is no longer a DraftNode
return super(Node, self).register_node(schema, auth, draft_registration, parent=parent, child_ids=child_ids, provider=provider, manual_guid=manual_guid)
return super(DraftNode, self).register_node(schema, auth, draft_registration, parent=parent, child_ids=child_ids, provider=provider, manual_guid=manual_guid)
Loading