Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io

into institutional-access-insti-admin-validation * 'develop' of https://github.com/CenterForOpenScience/osf.io: Add view, form to update moderation state
CenterForOpenScience · Jan 9, 2025 · 56f0959 · 56f0959
2 parents 8171f74 + 5941492
commit 56f0959
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/admin/nodes/views.py b/admin/nodes/views.py
@@ -118,6 +118,7 @@ def post(self, request, *args, **kwargs):
 
         return redirect('nodes:node', guid=kwargs.get('guid'))
 
+
 class NodeSearchView(PermissionRequiredMixin, FormView):
     """ Allows authorized users to search for a node by it's guid.
     """

diff --git a/admin/templates/nodes/node.html b/admin/templates/nodes/node.html
@@ -64,7 +64,12 @@ <h2>{{ node.type|cut:'osf.'|title }}: <b>{{ node.title }}</b> <a href="{{ node.a
                     </tr>
                     <tr>
                         <td>Moderation State</td>
-                        <td>{{ node.moderation_state }}</td>
+                        <td>{{ node.moderation_state }}
+                        <form method="post" action="{% url 'nodes:node-update-mod-state' node.guid %}">
+                            {% csrf_token %}
+                            <button type="submit" class="btn btn-primary">Update Moderation State</button>
+                        </form>
+                        </td>
                     </tr>
                     <tr>
                         <td>Creator</td>

diff --git a/osf/utils/machines.py b/osf/utils/machines.py
@@ -202,15 +202,14 @@ def save_changes(self, ev):
         if ev.event.name == DefaultTriggers.ACCEPT.value:
             if not self.machineable.target.is_contributor(self.machineable.creator):
                 contributor_permissions = ev.kwargs.get('permissions', permissions.READ)
-                make_curator = True if self.machineable.request_type == NodeRequestTypes.INSTITUTIONAL_REQUEST.value else False
                 try:
                     self.machineable.target.add_contributor(
                         self.machineable.creator,
                         auth=Auth(ev.kwargs['user']),
                         permissions=contributor_permissions,
                         visible=ev.kwargs.get('visible', True),
                         send_email=f'{self.machineable.request_type}_request',
-                        make_curator=make_curator,
+                        make_curator=self.machineable.request_type == NodeRequestTypes.INSTITUTIONAL_REQUEST.value,
                     )
                 except IntegrityError as e:
                     if 'Curators cannot be made bibliographic contributors' in str(e):
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,6 +118,7 @@ def post(self, request, *args, **kwargs): @@
             return redirect('nodes:node', guid=kwargs.get('guid'))
     class NodeSearchView(PermissionRequiredMixin, FormView):
         """ Allows authorized users to search for a node by it's guid.
         """
@@ Expand Down @@