Skip to content

Commit 1e66040

Browse files
committed
WIP prevent draft_node convert_draft_node_to_node when registering
1 parent 9e13c06 commit 1e66040

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

osf/models/archive.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ArchiveJob(ObjectIDMixin, BaseModel):
5555
dst_node = models.ForeignKey('Registration', related_name='archive_jobs',
5656
verbose_name='destination node', null=True,
5757
blank=True, on_delete=models.CASCADE)
58-
src_node = models.ForeignKey('Node', verbose_name='source node', null=True,
58+
src_node = models.ForeignKey('AbstractNode', verbose_name='source node', null=True,
5959
blank=True, on_delete=models.CASCADE)
6060
initiator = models.ForeignKey('OSFUser', null=True, on_delete=models.CASCADE)
6161

osf/models/draft_node.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from framework.auth.core import Auth
44
from django.utils import timezone
55

6-
from .node import AbstractNode, Node, NodeLog
6+
from .node import AbstractNode, NodeLog
77
from osf.exceptions import NodeStateError
88

99

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

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

3131
# Overrides AbstractNode.update_search
3232
def update_search(self):
@@ -68,9 +68,9 @@ def register_node(self, schema, auth, draft_registration, parent=None, child_ids
6868
:param parent Node: parent registration of registration to be created
6969
:param provider RegistrationProvider: provider to submit the registration to
7070
"""
71-
self.convert_draft_node_to_node(auth)
71+
# self.convert_draft_node_to_node(auth)
7272
# Copies editable fields from the DraftRegistration back to the Node
7373
self.copy_editable_fields(draft_registration, save=True)
7474

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

0 commit comments

Comments
 (0)