Merge branch 'release/25.14.0'

Author: adlius

addons/base/views.py

@@ -1006,13 +1006,17 @@ def persistent_file_download(auth, **kwargs):
     file = BaseFileNode.active.filter(_id=id_or_guid).first()
     if not file:
         guid = Guid.load(id_or_guid)
-        if guid:
-            file = guid.referent
-        else:
+        if not guid:
             raise HTTPError(http_status.HTTP_404_NOT_FOUND, data={
                 'message_short': 'File Not Found',
                 'message_long': 'The requested file could not be found.'
             })
+
+        file = guid.referent
+        if type(file) is Preprint:
+            referent, _ = Guid.load_referent(id_or_guid)
+            file = referent.primary_file
+
     if not file.is_file:
         raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data={
             'message_long': 'Downloading folders is not permitted.'

admin/institutions/urls.py

@@ -9,6 +9,7 @@
     re_path(r'^import/$', views.ImportInstitution.as_view(), name='import'),
     re_path(r'^(?P<institution_id>[0-9]+)/$', views.InstitutionDetail.as_view(), name='detail'),
     re_path(r'^(?P<institution_id>[0-9]+)/export/$', views.InstitutionExport.as_view(), name='export'),
+    re_path(r'^(?P<institution_id>[0-9]+)/monthly_report/$', views.InstitutionMonthlyReporterDo.as_view(), name='monthly_report'),
     re_path(r'^(?P<institution_id>[0-9]+)/delete/$', views.DeleteInstitution.as_view(), name='delete'),
     re_path(r'^(?P<institution_id>[0-9]+)/deactivate/$', views.DeactivateInstitution.as_view(), name='deactivate'),
     re_path(r'^(?P<institution_id>[0-9]+)/reactivate/$', views.ReactivateInstitution.as_view(), name='reactivate'),

admin/institutions/views.py

@@ -1,4 +1,5 @@
 import json
+from dateutil.parser import isoparse
 
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
@@ -15,6 +16,9 @@
 from admin.base.forms import ImportFileForm
 from admin.institutions.forms import InstitutionForm, InstitutionalMetricsAdminRegisterForm
 from osf.models import Institution, Node, OSFUser
+from osf.metrics.utils import YearMonth
+from osf.metrics.reporters import AllMonthlyReporters
+from osf.management.commands.monthly_reporters_go import monthly_reporter_do
 
 
 class InstitutionList(PermissionRequiredMixin, ListView):
@@ -129,6 +133,38 @@ def get(self, request, *args, **kwargs):
         return response
 
 
+class InstitutionMonthlyReporterDo(PermissionRequiredMixin, View):
+    permission_required = 'osf.view_institution'
+    raise_exception = True
+
+    def post(self, request, *args, **kwargs):
+        institution_id = self.kwargs.get('institution_id')
+        try:
+            institution = Institution.objects.get_all_institutions().get(id=institution_id)
+        except Institution.DoesNotExist:
+            raise Http404(f"Institution with id {institution_id} is not found or deactivated.")
+
+        monthly_report_date = request.POST.get('monthly_report_date', None)
+        if monthly_report_date:
+            try:
+                monthly_report_date = isoparse(monthly_report_date).date()
+            except ValueError as exc:
+                messages.error(request, str(exc))
+                return redirect('institutions:detail', institution_id=institution.id)
+        else:
+            messages.error(request, 'Report date cannot be none.')
+            return redirect('institutions:detail', institution_id=institution.id)
+
+        monthly_reporter_do.apply_async(kwargs={
+            'yearmonth': str(YearMonth.from_date(monthly_report_date)),
+            'reporter_key': request.POST.get('monthly_reporter', None),
+            'report_kwargs': {'institution_pk': institution.id},
+        })
+
+        messages.success(request, 'Monthly reporter successfully went.')
+        return redirect('institutions:detail', institution_id=institution.id)
+
+
 class CreateInstitution(PermissionRequiredMixin, CreateView):
     permission_required = 'osf.change_institution'
     raise_exception = True
@@ -141,6 +177,18 @@ def get_context_data(self, *args, **kwargs):
         kwargs['import_form'] = ImportFileForm()
         return super().get_context_data(*args, **kwargs)
 
+    def form_valid(self, form):
+        response = super().form_valid(form)
+
+        # Make a report after Institution is created
+        monthly_reporter_do.apply_async(kwargs={
+            'yearmonth': str(YearMonth.from_date(self.object.created)),
+            'reporter_key': AllMonthlyReporters.INSTITUTIONAL_SUMMARY.name,
+            'report_kwargs': {'institution_pk': self.object.id},
+        })
+
+        return response
+
 
 class InstitutionNodeList(PermissionRequiredMixin, ListView):
     template_name = 'institutions/node_list.html'

admin/maintenance/views.py

@@ -6,6 +6,7 @@
 from admin.maintenance.forms import MaintenanceForm
 
 from django.shortcuts import redirect
+from django.urls import reverse_lazy
 from django.forms.models import model_to_dict
 from django.views.generic import DeleteView, TemplateView
 from django.contrib.auth.mixins import PermissionRequiredMixin
@@ -15,11 +16,13 @@ class DeleteMaintenance(PermissionRequiredMixin, DeleteView):
     permission_required = 'osf.delete_maintenancestate'
     raise_exception = True
     template_name = 'maintenance/delete_maintenance.html'
+    success_url = reverse_lazy('maintenance:display')
 
     def get_object(self, queryset=None):
         return MaintenanceState.objects.first()
 
-    def delete(self, request, *args, **kwargs):
+    def post(self, request, *args, **kwargs):
+        super().post(request, *args, **kwargs)
         maintenance.unset_maintenance()
         return redirect('maintenance:display')
 

admin/management/views.py

@@ -130,6 +130,7 @@ def post(self, request, *args, **kwargs):
                 if report_date is not None
                 else ''
             ),
+            reporter_key=request.POST.get('monthly_reporter', '')
         )
 
         if errors:

admin/nodes/urls.py

@@ -45,4 +45,5 @@
     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'),
     re_path(r'^(?P<guid>[a-z0-9]+)/resync_datacite/$', views.NodeResyncDataCiteView.as_view(), name='resync-datacite'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/revert/$', views.NodeRevertToDraft.as_view(), name='revert-to-draft'),
 ]

admin/nodes/views.py

@@ -14,7 +14,6 @@
     View,
     FormView,
     ListView,
-    TemplateView,
 )
 from django.shortcuts import redirect, reverse, get_object_or_404
 from django.urls import reverse_lazy
@@ -102,11 +101,16 @@ def get_context_data(self, **kwargs):
         node = self.get_object()
 
         detailed_duplicates = detect_duplicate_notifications(node_id=node.id)
-
+        children = node.get_nodes(is_node_link=False)
+        # Annotate guid because django templates prohibit accessing attributes that start with underscores
+        children = AbstractNode.objects.filter(
+            id__in=[child.id for child in children]
+        ).prefetch_related('guids').annotate(guid=F('guids___id'))
         context.update({
             'SPAM_STATUS': SpamStatus,
             'STORAGE_LIMITS': settings.StorageLimits,
             'node': node,
+            'children': children,
             'duplicates': detailed_duplicates
         })
 
@@ -193,10 +197,9 @@ def add_contributor_removed_log(self, node, user):
         ).save()
 
 
-class NodeDeleteView(NodeMixin, TemplateView):
+class NodeDeleteView(NodeMixin, View):
     """ Allows authorized users to mark nodes as deleted.
     """
-    template_name = 'nodes/remove_node.html'
     permission_required = ('osf.view_node', 'osf.delete_node')
     raise_exception = True
 
@@ -761,7 +764,7 @@ def post(self, request, *args, **kwargs):
 
         allow_unconfigured = force_archive_params.get('allow_unconfigured', False)
 
-        addons = set(force_archive_params.getlist('addons', []))
+        addons = set(registration.registered_from.get_addon_names())
         addons.update(DEFAULT_PERMISSIBLE_ADDONS)
 
         try:
@@ -780,8 +783,8 @@ def post(self, request, *args, **kwargs):
                     registration,
                     permissible_addons=addons,
                     allow_unconfigured=allow_unconfigured,
-                    skip_collision=skip_collision,
-                    delete_collision=delete_collision,
+                    skip_collisions=skip_collision,
+                    delete_collisions=delete_collision,
                 )
                 messages.success(request, 'Registration archive process has finished.')
             except Exception as exc:
@@ -800,3 +803,12 @@ def post(self, request, *args, **kwargs):
         registration = self.get_object()
         registration.request_identifier_update('doi', create=True)
         return redirect(self.get_success_url())
+
+
+class NodeRevertToDraft(NodeMixin, View):
+    permission_required = 'osf.change_node'
+
+    def post(self, request, *args, **kwargs):
+        registration = self.get_object()
+        registration.to_draft()
+        return redirect(self.get_success_url())

admin/preprint_providers/forms.py

@@ -116,10 +116,10 @@ def __init__(self, *args, provider_groups=None, **kwargs):
         super().__init__(*args, **kwargs)
 
         provider_groups = provider_groups or Group.objects.none()
-        self.fields['group_perms'] = forms.ModelMultipleChoiceField(
+        self.fields['group_perms'] = forms.ModelChoiceField(
             queryset=provider_groups,
             required=False,
-            widget=forms.CheckboxSelectMultiple
+            widget=forms.RadioSelect
         )
 
     user_id = forms.CharField(required=True, max_length=5, min_length=5)

admin/preprint_providers/views.py

@@ -481,10 +481,14 @@ def form_valid(self, form):
         if not osf_user:
             raise Http404(f'OSF user with id "{user_id}" not found. Please double check.')
 
-        for group in form.cleaned_data.get('group_perms'):
-            self.target_provider.add_to_group(osf_user, group)
+        if osf_user.has_groups(self.target_provider.group_names):
+            messages.error(self.request, f'User with guid: {user_id} is already a moderator or admin')
+            return super().form_invalid(form)
 
+        group = form.cleaned_data.get('group_perms')
+        self.target_provider.add_to_group(osf_user, group)
         osf_user.save()
+
         messages.success(self.request, f'Permissions update successful for OSF User {osf_user.username}!')
         return super().form_valid(form)
 

admin/providers/views.py

@@ -29,8 +29,7 @@ def post(self, request, *args, **kwargs):
             messages.error(request, f'User for guid: {data["add-moderators-form"][0]} could not be found')
             return redirect(f'{self.url_namespace}:add_admin_or_moderator', provider_id=provider.id)
 
-        groups = [provider.format_group(name) for name in provider.groups.keys()]
-        if target_user.has_groups(groups):
+        if target_user.has_groups(provider.group_names):
             messages.error(request, f'User with guid: {data["add-moderators-form"][0]} is already a moderator or admin')
             return redirect(f'{self.url_namespace}:add_admin_or_moderator', provider_id=provider.id)