split off more access request and institutional request behavior into…

… parallel workflows, changes to JS user serialization to check node for request

osf/models/contributor.py

@@ -1,4 +1,6 @@
 from django.db import models, IntegrityError
+
+from osf.utils.caching import cached_property
 from osf.utils.fields import NonNaiveDateTimeField
 from osf.utils import permissions
 
@@ -42,10 +44,16 @@ class Meta:
         # NOTE: Adds an _order column
         order_with_respect_to = 'node'
 
+    @cached_property
+    def has_institutional_request(self):
+        """
+        Checks if user a has requested a node using the institutional access request feature.
+        """
+        return self.user.has_institutional_request(self.node)
+
     def save(self, *args, **kwargs):
-        if self.user.is_institutional_admin():
-            if self.visible:
-                raise IntegrityError('Curators cannot be made bibliographic contributors')
+        if self.has_institutional_request and self.visible:
+            raise IntegrityError('Curators cannot be made bibliographic contributors')
 
         return super().save(*args, **kwargs)
 

osf/models/user.py

@@ -58,7 +58,7 @@
 from website.util.metrics import OsfSourceTags, unregistered_created_source_tag
 from importlib import import_module
 from osf.utils.requests import get_headers_from_request
-from osf.utils.workflows import NodeRequestTypes
+from osf.utils.workflows import NodeRequestTypes, DefaultStates
 
 SessionStore = import_module(settings.SESSION_ENGINE).SessionStore
 
@@ -680,6 +680,7 @@ def has_institutional_request(self, node):
         """
         return NodeRequest.objects.filter(
             request_type=NodeRequestTypes.INSTITUTIONAL_REQUEST.value,
+            machine_state=DefaultStates.PENDING.value,
             target=node,
             creator=self,
         ).exists()

website/profile/utils.py

@@ -15,7 +15,7 @@ def get_profile_image_url(user, size=settings.PROFILE_IMAGE_MEDIUM):
                              use_ssl=True,
                              size=size)
 
-def serialize_user(user, node=None, admin=False, full=False, is_profile=False, include_node_counts=False):
+def serialize_user(user, node=None, admin=False, full=False, is_profile=False, include_node_counts=False, contributor=True):
     """
     Return a dictionary representation of a registered user.
 
@@ -38,7 +38,7 @@ def serialize_user(user, node=None, admin=False, full=False, is_profile=False, i
         'profile_image_url': user.profile_image_url(size=settings.PROFILE_IMAGE_MEDIUM),
         'active': user.is_active,
     }
-    if node is not None:
+    if contributor and node is not None:
         if admin:
             flags = {
                 'visible': False,
@@ -196,7 +196,7 @@ def serialize_access_requests(node):
     """Serialize access requests for a node"""
     return [
         {
-            'user': serialize_user(access_request.creator),
+            'user': serialize_user(access_request.creator, node, contributor=False),
             'comment': access_request.comment,
             'requested_permissions': access_request.requested_permissions,
             'id': access_request._id

website/static/js/accessRequestManager.js

@@ -23,8 +23,8 @@ var AccessRequestModel = function(accessRequest, pageOwner, isRegistration, isPa
     self.permissionText = ko.observable(self.options.permissionMap[self.permission()]);
 
     self.is_curator = ko.observable(accessRequest.user.is_curator || false);
-    self.is_institutional_admin = ko.observable(accessRequest.user.is_institutional_admin || false);
-    self.visible = ko.observable(!accessRequest.user.is_institutional_admin);
+    self.has_institutional_request = ko.observable(accessRequest.user.has_institutional_request || false);
+    self.visible = ko.observable(!accessRequest.user.has_institutional_request);
     self.pageOwner = pageOwner;
 
     self.expanded = ko.observable(false);