Merge remote-tracking branch 'upstream/develop' into feature/preprint…

…s-doi-versioning

Dockerfile

@@ -54,7 +54,9 @@ RUN set -ex \
 WORKDIR /code
 
 # Policies
-ADD https://github.com/CenterForOpenScience/cos.io.git#master ./COS_POLICIES/
+RUN git clone https://github.com/CenterForOpenScience/cos.io.git ./COS_POLICIES/
+# When Jenkins uses a newer docker:
+# ADD https://github.com/CenterForOpenScience/cos.io.git#master ./COS_POLICIES/
 
 COPY pyproject.toml .
 COPY poetry.lock .

admin/nodes/urls.py

@@ -38,4 +38,5 @@
     re_path(r'^(?P<guid>[a-z0-9]+)/make_private/$', views.NodeMakePrivate.as_view(), name='make-private'),
     re_path(r'^(?P<guid>[a-z0-9]+)/make_public/$', views.NodeMakePublic.as_view(), name='make-public'),
     re_path(r'^(?P<guid>[a-z0-9]+)/remove_notifications/$', views.NodeRemoveNotificationView.as_view(), name='node-remove-notifications'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/update_moderation_state/$', views.NodeUpdateModerationStateView.as_view(), name='node-update-mod-state'),
 ]

admin/nodes/views.py

@@ -118,6 +118,17 @@ def post(self, request, *args, **kwargs):
 
         return redirect('nodes:node', guid=kwargs.get('guid'))
 
+
+class NodeUpdateModerationStateView(View):
+    def post(self, request, *args, **kwargs):
+        guid = kwargs.get('guid')
+        node = AbstractNode.load(guid)
+        node.update_moderation_state()
+        messages.success(request, 'Moderation state successfully updated.')
+
+        return redirect('nodes:node', guid=kwargs.get('guid'))
+
+
 class NodeSearchView(PermissionRequiredMixin, FormView):
     """ Allows authorized users to search for a node by it's guid.
     """

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>