fix draft registrations affiliated institution default value for no-p…

…roject registrations and clean-up code
Johnetordoff · Oct 16, 2023 · 09f59b5 · 09f59b5
1 parent b032af0
commit 09f59b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/api/nodes/serializers.py b/api/nodes/serializers.py
@@ -1557,12 +1557,6 @@ class DraftRegistrationLegacySerializer(JSONAPISerializer):
         'html': 'get_absolute_url',
     })
 
-    affiliate_user_institutions = ser.BooleanField(
-        required=False,
-        default=True,
-        help_text='Specify whether user institution affiliations should be copied over to the draft registration.',
-    )
-
     def get_absolute_url(self, obj):
         return obj.absolute_url
 
@@ -1603,7 +1597,6 @@ def create(self, validated_data):
         registration_responses = validated_data.pop('registration_responses', None)
         schema = validated_data.pop('registration_schema')
         provider = validated_data.pop('provider', None)
-        affiliate_user_institutions = validated_data.pop('affiliate_user_institutions', True)
 
         self.enforce_metadata_or_registration_responses(metadata, registration_responses)
 
@@ -1618,9 +1611,6 @@ def create(self, validated_data):
         if registration_responses:
             self.update_registration_responses(draft, registration_responses)
 
-        if affiliate_user_institutions and draft.branched_from_type == DraftNode:
-            draft.affiliated_institutions.set(draft.creator.affiliated_institutions.all())
-
         return draft
 
     class Meta:

diff --git a/osf/models/registrations.py b/osf/models/registrations.py
@@ -1261,25 +1261,27 @@ def create_from_node(cls, user, schema, node=None, data=None, provider=None):
         else:
             provider.validate_schema(schema)
 
-        if not node:
-            # If no node provided, a DraftNode is created for you
-            node = DraftNode.objects.create(creator=user, title='Untitled')
+        if node:
+            branched_from = node
+        else:
+            branched_from = DraftNode.objects.create(creator=user, title='Untitled')
 
-        if not (isinstance(node, Node) or isinstance(node, DraftNode)):
+        if not isinstance(branched_from, (Node, DraftNode)):
             raise DraftRegistrationStateError()
 
         draft = cls(
             initiator=user,
-            branched_from=node,
+            branched_from=branched_from,
             registration_schema=schema,
             registration_metadata=data or {},
             provider=provider,
         )
         draft.save()
-        draft.copy_editable_fields(node, Auth(user), save=True)
+        draft.copy_editable_fields(branched_from, Auth(user), save=True)
         draft.update(data, auth=Auth(user))
 
-        if node.type == 'osf.draftnode':
+        if not node:
+            draft.affiliated_institutions.add(*draft.creator.get_affiliated_institutions())
             initiator_permissions = draft.contributor_set.get(user=user).permission
             signals.contributor_added.send(
                 draft,