diff --git a/hawc/apps/animal/admin.py b/hawc/apps/animal/admin.py index 33fcf4163f..dad10cce98 100644 --- a/hawc/apps/animal/admin.py +++ b/hawc/apps/animal/admin.py @@ -1,10 +1,11 @@ from django.contrib import admin +from reversion.admin import VersionAdmin from . import models @admin.register(models.Experiment) -class ExperimentAdmin(admin.ModelAdmin): +class ExperimentAdmin(VersionAdmin, admin.ModelAdmin): raw_id_fields = ("study", "dtxsid") list_display = ( "id", @@ -24,7 +25,7 @@ class ExperimentAdmin(admin.ModelAdmin): @admin.register(models.AnimalGroup) -class AnimalGroupAdmin(admin.ModelAdmin): +class AnimalGroupAdmin(VersionAdmin, admin.ModelAdmin): list_display = ( "id", "experiment", @@ -46,7 +47,7 @@ class DoseGroupInline(admin.TabularInline): @admin.register(models.DosingRegime) -class DosingRegimeAdmin(admin.ModelAdmin): +class DosingRegimeAdmin(VersionAdmin, admin.ModelAdmin): list_display = ( "id", "dosed_animals", @@ -72,7 +73,7 @@ class EndpointGroupInline(admin.TabularInline): @admin.register(models.Endpoint) -class EndpointAdmin(admin.ModelAdmin): +class EndpointAdmin(VersionAdmin, admin.ModelAdmin): list_display = ( "id", "assessment_id", diff --git a/hawc/apps/animal/templates/animal/animalgroup_detail.html b/hawc/apps/animal/templates/animal/animalgroup_detail.html index 2ca095d8dc..dac1b24a1f 100644 --- a/hawc/apps/animal/templates/animal/animalgroup_detail.html +++ b/hawc/apps/animal/templates/animal/animalgroup_detail.html @@ -1,5 +1,7 @@ {% extends 'assessment-rooted.html' %} +{% load hawc %} + {% block content %} {% if obj_perms.edit %}
@@ -7,12 +9,14 @@
Animal Group Editing Update + Change logs Delete {% if object.dosing_regime and object == object.dosing_regime.dosed_animals %}
Dose Regime Editing Update + Change logs {% endif %}
diff --git a/hawc/apps/animal/templates/animal/endpoint_detail.html b/hawc/apps/animal/templates/animal/endpoint_detail.html index 2410cc79a0..19bf03142c 100644 --- a/hawc/apps/animal/templates/animal/endpoint_detail.html +++ b/hawc/apps/animal/templates/animal/endpoint_detail.html @@ -1,5 +1,7 @@ {% extends 'assessment-rooted.html' %} +{% load hawc %} + {% block content %} {% if crud == "Read" %} @@ -9,6 +11,7 @@
Endpoint Editing Update endpoint + Change logs Delete endpoint {% if assessment.enable_bmd and object.bmd_modeling_possible %}
diff --git a/hawc/apps/animal/templates/animal/experiment_detail.html b/hawc/apps/animal/templates/animal/experiment_detail.html index 7a63571ac3..2c6dce928f 100644 --- a/hawc/apps/animal/templates/animal/experiment_detail.html +++ b/hawc/apps/animal/templates/animal/experiment_detail.html @@ -1,5 +1,7 @@ {% extends 'assessment-rooted.html' %} +{% load hawc %} + {% block content %}

{{object}}

{% if obj_perms.edit %} @@ -8,6 +10,7 @@

{{object}}

Experiment Editing Update + Change logs Delete
Animal Group Editing diff --git a/hawc/apps/assessment/actions/__init__.py b/hawc/apps/assessment/actions/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/hawc/apps/assessment/actions/audit.py b/hawc/apps/assessment/actions/audit.py new file mode 100644 index 0000000000..9067f4bce8 --- /dev/null +++ b/hawc/apps/assessment/actions/audit.py @@ -0,0 +1,263 @@ +from enum import Enum +from typing import Optional + +import pandas as pd +from django.contrib.contenttypes.models import ContentType +from django.db.models import QuerySet +from reversion.models import Version + +from ...common.helper import FlatExport +from ...common.serializers import PydanticDrfSerializer +from ..constants import EpiVersion +from ..models import Assessment + + +def versions_by_content_type(app_label: str, model: str, qs: Optional[QuerySet] = None) -> QuerySet: + if qs is None: + qs = Version.objects.all() + ct = ContentType.objects.get(app_label=app_label, model=model) + return qs.filter(content_type=ct) + + +def versions_by_related_field( + related_field: str, related_values: list, qs: Optional[QuerySet] = None +) -> QuerySet: + qs = Version.objects.all() if qs is None else qs + ored_values = "|".join([str(id) for id in related_values]) + data_regex = ( + rf"[\"\']fields[\"\']\s*:\s*{{[^}}]*?[\"\']{related_field}[\"\']\s*:\s*({ored_values})\s*," + ) + return qs.filter(serialized_data__iregex=data_regex) + + +class AuditType(str, Enum): + ASSESSMENT = "assessment" + ANIMAL = "animal" + EPI = "epi" + ROB = "riskofbias" + + +class AssessmentAuditSerializer(PydanticDrfSerializer): + assessment: Assessment + type: AuditType + + class Config: + arbitrary_types_allowed = True + + def get_assessment_queryset(self): + # assessments + assess_qs = Version.objects.get_for_model(Assessment).filter(object_id=self.assessment.pk) + + # get assessment attachments + attach_qs = versions_by_content_type("assessment", "attachment") + attach_qs = versions_by_related_field( + "content_type", [ContentType.objects.get_for_model(Assessment).id], attach_qs + ) + attach_qs = versions_by_related_field("object_id", [self.assessment.pk], attach_qs) + + # get assessment datasets + dataset_qs = versions_by_content_type("assessment", "dataset") + dataset_qs = versions_by_related_field("assessment", [self.assessment.pk], dataset_qs) + + # get assessment dataset revisions + dataset_revision_qs = versions_by_content_type("assessment", "datasetrevision") + dataset_revision_qs = versions_by_related_field( + "dataset", set(dataset_qs.values_list("object_id", flat=True)), dataset_revision_qs + ) + + # get assessment summary tables + summary_table_qs = versions_by_content_type("summary", "summarytable") + summary_table_qs = versions_by_related_field( + "assessment", [self.assessment.pk], summary_table_qs + ) + # get assessment visuals + visual_qs = versions_by_content_type("summary", "visual") + visual_qs = versions_by_related_field("assessment", [self.assessment.pk], visual_qs) + # get assessment data pivots + data_pivot_qs = versions_by_content_type("summary", "datapivot") + data_pivot_qs = versions_by_related_field("assessment", [self.assessment.pk], data_pivot_qs) + # get data pivot uploads + data_pivot_upload_qs = versions_by_content_type("summary", "datapivotupload") + data_pivot_upload_qs = data_pivot_upload_qs.filter( + object_id__in=set(data_pivot_qs.values_list("object_id", flat=True)) + ) + # get data pivot queries + data_pivot_query_qs = versions_by_content_type("summary", "datapivotquery") + data_pivot_query_qs = data_pivot_query_qs.filter( + object_id__in=set(data_pivot_qs.values_list("object_id", flat=True)) + ) + + return ( + assess_qs + | attach_qs + | dataset_qs + | dataset_revision_qs + | summary_table_qs + | visual_qs + | data_pivot_qs + | data_pivot_upload_qs + | data_pivot_query_qs + ) + + def get_animal_queryset(self): + # get assessment references + reference_qs = versions_by_content_type("lit", "reference") + reference_qs = versions_by_related_field("assessment", [self.assessment.pk], reference_qs) + # get reference studies + study_qs = versions_by_content_type("study", "study") + study_qs = study_qs.filter( + object_id__in=set(reference_qs.values_list("object_id", flat=True)) + ) + # get study experiments + experiment_qs = versions_by_content_type("animal", "experiment") + experiment_qs = versions_by_related_field( + "study", set(study_qs.values_list("object_id", flat=True)), experiment_qs + ) + # get experiment animal groups + animal_group_qs = versions_by_content_type("animal", "animalgroup") + animal_group_qs = versions_by_related_field( + "experiment", set(experiment_qs.values_list("object_id", flat=True)), animal_group_qs + ) + # get animal group endpoints + endpoint_qs = versions_by_content_type("animal", "endpoint") + endpoint_qs = versions_by_related_field( + "animal_group", set(animal_group_qs.values_list("object_id", flat=True)), endpoint_qs + ) + # get base endpoints + base_endpoint_qs = versions_by_content_type("assessment", "baseendpoint") + base_endpoint_qs = base_endpoint_qs.filter( + object_id__in=set(endpoint_qs.values_list("object_id", flat=True)) + ) + + return experiment_qs | animal_group_qs | endpoint_qs | base_endpoint_qs + + def get_epiv1_queryset(self): + # get assessment references + reference_qs = versions_by_content_type("lit", "reference") + reference_qs = versions_by_related_field("assessment", [self.assessment.pk], reference_qs) + # get reference studies + study_qs = versions_by_content_type("study", "study") + study_qs = study_qs.filter( + object_id__in=set(reference_qs.values_list("object_id", flat=True)) + ) + # get study populations + study_population_qs = versions_by_content_type("epi", "studypopulation") + study_population_qs = versions_by_related_field( + "study", set(study_qs.values_list("object_id", flat=True)), study_population_qs + ) + # get study population outcomes + outcome_qs = versions_by_content_type("epi", "outcome") + outcome_qs = versions_by_related_field( + "study_population", + set(study_population_qs.values_list("object_id", flat=True)), + outcome_qs, + ) + # get study population exposures + exposure_qs = versions_by_content_type("epi", "exposure") + exposure_qs = versions_by_related_field( + "study_population", + set(study_population_qs.values_list("object_id", flat=True)), + exposure_qs, + ) + # get outcome results + result_qs = versions_by_content_type("epi", "result") + result_qs = versions_by_related_field( + "outcome", set(outcome_qs.values_list("object_id", flat=True)), result_qs + ) + + return study_population_qs | outcome_qs | exposure_qs | result_qs + + def get_epiv2_queryset(self): + # get assessment references + reference_qs = versions_by_content_type("lit", "reference") + reference_qs = versions_by_related_field("assessment", [self.assessment.pk], reference_qs) + # get reference studies + study_qs = versions_by_content_type("study", "study") + study_qs = study_qs.filter( + object_id__in=set(reference_qs.values_list("object_id", flat=True)) + ) + # get study designs + design_qs = versions_by_content_type("epiv2", "design") + design_qs = versions_by_related_field( + "study", set(study_qs.values_list("object_id", flat=True)), design_qs + ) + # get design chemicals + chemical_qs = versions_by_content_type("epiv2", "chemical") + chemical_qs = versions_by_related_field( + "study", set(design_qs.values_list("object_id", flat=True)), chemical_qs + ) + # get design exposures + exposure_qs = versions_by_content_type("epiv2", "exposure") + exposure_qs = versions_by_related_field( + "design", set(design_qs.values_list("object_id", flat=True)), exposure_qs + ) + # get design exposure levels + exposure_level_qs = versions_by_content_type("epiv2", "exposurelevel") + exposure_level_qs = versions_by_related_field( + "design", set(design_qs.values_list("object_id", flat=True)), exposure_level_qs + ) + # get design outcomes + outcome_qs = versions_by_content_type("epiv2", "outcome") + outcome_qs = versions_by_related_field( + "design", set(design_qs.values_list("object_id", flat=True)), outcome_qs + ) + # get design adjustment factors + adjustment_factor_qs = versions_by_content_type("epiv2", "adjustmentfactor") + adjustment_factor_qs = versions_by_related_field( + "design", set(design_qs.values_list("object_id", flat=True)), adjustment_factor_qs + ) + # get design data extractions + data_extraction_qs = versions_by_content_type("epiv2", "dataextraction") + data_extraction_qs = versions_by_related_field( + "design", set(design_qs.values_list("object_id", flat=True)), data_extraction_qs + ) + + return ( + design_qs + | chemical_qs + | exposure_qs + | exposure_level_qs + | outcome_qs + | adjustment_factor_qs + | data_extraction_qs + ) + + def get_riskofbias_queryset(self): + # get assessment domains + domain_qs = versions_by_content_type("riskofbias", "riskofbiasdomain") + domain_qs = versions_by_related_field("assessment", [self.assessment.pk], domain_qs) + # get domain metrics + metric_qs = versions_by_content_type("riskofbias", "riskofbiasmetric") + metric_qs = versions_by_related_field( + "domain", set(domain_qs.values_list("object_id", flat=True)), metric_qs + ) + # get metric scores + score_qs = versions_by_content_type("riskofbias", "riskofbiasscore") + score_qs = versions_by_related_field( + "metric", set(metric_qs.values_list("object_id", flat=True)), score_qs + ) + + return domain_qs | metric_qs | score_qs + + def get_queryset(self): + audit_type = self.type + if audit_type == AuditType.EPI: + audit_type = "epiv1" if self.assessment.epi_version == EpiVersion.V1 else "epiv2" + qs = getattr(self, f"get_{audit_type}_queryset")() + return qs.select_related("content_type", "revision") + + def export(self) -> FlatExport: + qs = self.get_queryset() + df = pd.DataFrame( + qs.values_list( + "content_type__app_label", + "content_type__model", + "object_id", + "serialized_data", + "revision__user", + "revision__date_created", + ), + columns=["app", "model", "pk", "serialized_data", "user", "date_revised"], + ) + export = FlatExport(df=df, filename=f"{self.assessment}-{self.type}-audit-logs") + return export diff --git a/hawc/apps/assessment/api.py b/hawc/apps/assessment/api.py index 62a7a68e20..523fef8760 100644 --- a/hawc/apps/assessment/api.py +++ b/hawc/apps/assessment/api.py @@ -13,6 +13,7 @@ from rest_framework.decorators import action from rest_framework.exceptions import APIException, PermissionDenied from rest_framework.pagination import PageNumberPagination +from rest_framework.request import Request from rest_framework.response import Response from hawc.services.epa import dsstox @@ -21,6 +22,7 @@ from ..common.renderers import PandasRenderers from ..common.views import create_object_log from . import models, serializers +from .actions.audit import AssessmentAuditSerializer class DisabledPagination(PageNumberPagination): @@ -301,7 +303,7 @@ def public(self, request): return Response(serializer.data) @action(detail=True) - def endpoints(self, request, pk: int = None): + def endpoints(self, request, pk: int): """ Optimized for queryset speed; some counts in get_queryset and others in the list here; depends on if a "select distinct" is @@ -458,6 +460,15 @@ def endpoints(self, request, pk: int = None): return Response({"name": instance.name, "id": instance.id, "items": items}) + @action(detail=True, url_path=r"logs/(?P[\w]+)", renderer_classes=PandasRenderers) + def logs(self, request: Request, pk: int, type: str): + instance = self.get_object() + if not instance.user_is_team_member_or_higher(self.request.user): + raise PermissionDenied() + serializer = AssessmentAuditSerializer.from_drf(data=dict(assessment=instance, type=type)) + export = serializer.export() + return Response(export) + class DatasetViewset(AssessmentViewset): model = models.Dataset diff --git a/hawc/apps/assessment/managers.py b/hawc/apps/assessment/managers.py index e01ed5212f..3741102f60 100644 --- a/hawc/apps/assessment/managers.py +++ b/hawc/apps/assessment/managers.py @@ -1,7 +1,10 @@ import json +from datetime import datetime, timedelta +from typing import Any, NamedTuple, Union from django.contrib.contenttypes.models import ContentType from django.db.models import Q, QuerySet +from reversion.models import Version from ..common.helper import HAWCDjangoJSONEncoder from ..common.models import BaseManager @@ -140,3 +143,112 @@ class TimeSpentEditingManager(BaseManager): class DatasetManager(BaseManager): assessment_relation = "assessment" + + +class Event(NamedTuple): + """A potentially collapsed changed event between Logs and Reversions""" + + message: str + snapshot: str + user: Any + created: datetime + + +class EventPair: + """An Event Pair Comparison between a Log and Reversion""" + + def __init__(self, item_1, item_2=None): + """Build an event pair, or at least one event. + + Args: + item_1 (Union[Log, Version]): The first item in the pair + item_2 (Union[Log, Version], optional): The optional second item in the pair + """ + self.log = None + self.version = None + if isinstance(item_1, Version): + self.version = item_1 + else: + self.log = item_1 + if item_2: + if isinstance(item_2, Version): + self.version = item_2 + else: + self.log = item_2 + + def collapsable(self) -> bool: + # should the two items be collapsed? + if self.log is None or self.version is None: + return False + return abs(self.log.created - self.version.revision.date_created) < timedelta(seconds=10) + + def output(self) -> Event: + # Return a collapsed event + return Event( + message=self.log.message if self.log else "", + snapshot=self.version.serialized_data if self.version else "", + user=self.log.user if self.log else self.version.revision.user, + created=self.log.created if self.log else self.version.revision.date_created, + ) + + +class LogManager(BaseManager): + assessment_relation = "assessment" + + def get_object_audit( + self, content_type: Union[ContentType, int], object_id: int + ) -> list[Event]: + """ + Combines information from HAWC's internal logs and reversion logs for a more complete audit. + Matching is attempted between these two log types to account for same operations. + + Args: + content_type (Union[ContentType, int]): Content type of interested object. + object_id (int): ID of interested object. + + Returns: + list[Event]: Serialized logs with message, snapshot, user, and date created. + """ + # sort all events in descending order + logs = ( + self.filter(content_type=content_type, object_id=object_id) + .select_related("user") + .order_by("id") + ) + versions = ( + Version.objects.filter(content_type=content_type, object_id=object_id) + .select_related("revision__user") + .order_by("id") + ) + events = list(logs) + list(versions) + events.sort( + key=lambda el: el.created if isinstance(el, self.model) else el.revision.date_created, + reverse=True, + ) + + # build event aggregations + aggregations = [] + used_next_event = None + for i, this_event in enumerate(events): + # skip current item if we've already used it + if this_event is used_next_event: + continue + + # try to get next event to compare; if we dont have one, add the current + try: + next_event = events[i + 1] + except IndexError: + aggregations.append(EventPair(this_event).output()) + break + + # run pair comparisons + pair = EventPair(this_event, next_event) + if pair.collapsable(): + # add both; mark second as consumed + aggregations.append(pair.output()) + used_next_event = next_event + else: + # just add one + aggregations.append(EventPair(this_event).output()) + + return aggregations diff --git a/hawc/apps/assessment/models.py b/hawc/apps/assessment/models.py index bf6ee7d331..effabb9021 100644 --- a/hawc/apps/assessment/models.py +++ b/hawc/apps/assessment/models.py @@ -914,6 +914,8 @@ def set_message(cls, model, text: str) -> "Communication": class Log(models.Model): + objects = managers.LogManager() + assessment = models.ForeignKey( Assessment, blank=True, null=True, related_name="logs", on_delete=models.CASCADE ) @@ -1039,6 +1041,7 @@ def rendered_page( reversion.register(DSSTox) reversion.register(Assessment) +reversion.register(Attachment) reversion.register(EffectTag) reversion.register(Species) reversion.register(Strain) diff --git a/hawc/apps/assessment/templates/assessment/assessment_log_list.html b/hawc/apps/assessment/templates/assessment/assessment_log_list.html index b2bd79f19e..2f8d87e8ba 100644 --- a/hawc/apps/assessment/templates/assessment/assessment_log_list.html +++ b/hawc/apps/assessment/templates/assessment/assessment_log_list.html @@ -5,7 +5,17 @@ {% block content %} -

{{assessment}} Logs

+

{{assessment}} Logs

+
+ Actions +
+ Download Logs + Assessment + Risk of bias + Animal + Epidemiology +
+
diff --git a/hawc/apps/assessment/templates/assessment/log_object_list.html b/hawc/apps/assessment/templates/assessment/log_object_list.html index f4d3d103d2..f3029a0706 100644 --- a/hawc/apps/assessment/templates/assessment/log_object_list.html +++ b/hawc/apps/assessment/templates/assessment/log_object_list.html @@ -1,4 +1,4 @@ -{% extends assessment|yesno:"assessment-rooted.html,crumbless.html" %} +{% extends first_log.assessment|yesno:"assessment-rooted.html,crumbless.html" %} {% block content %} @@ -31,7 +31,7 @@

{{first_log}}s

Assessment - {{assessment}} + {{first_log.assessment}} @@ -40,28 +40,34 @@

{{first_log}}s

Logs

+ + + + + - - + + - - {% for obj in page_obj %} + {% for event in object_list %} - - - + + + + + {% empty %} + + {% endfor %} -
MessageUser TimestampUserMessage
{{obj.message}}{{obj.user}}{{obj.created}}{{event.created}}{{event.user}}{% if event.message %}

{{event.message}}

{% endif %}{{event.snapshot}}
+ No logs available; see details below. +
-{% include "includes/paginator.html" %} - {% include 'assessment/_logs_note.html' %} - {% endblock content %} diff --git a/hawc/apps/assessment/urls.py b/hawc/apps/assessment/urls.py index d82dd73c72..b78f5b9ef5 100644 --- a/hawc/apps/assessment/urls.py +++ b/hawc/apps/assessment/urls.py @@ -38,7 +38,7 @@ path("/clear-cache/", views.AssessmentClearCache.as_view(), name="clear_cache"), # log object path( - "//log/", + "log///", views.LogObjectList.as_view(), name="log_object_list", ), diff --git a/hawc/apps/assessment/views.py b/hawc/apps/assessment/views.py index a36f604c27..a64e379b26 100644 --- a/hawc/apps/assessment/views.py +++ b/hawc/apps/assessment/views.py @@ -8,7 +8,7 @@ from django.contrib.auth.mixins import UserPassesTestMixin from django.contrib.contenttypes.models import ContentType from django.core.cache import cache -from django.core.exceptions import PermissionDenied +from django.core.exceptions import ObjectDoesNotExist, PermissionDenied from django.db import transaction from django.db.models import Count from django.http import ( @@ -771,20 +771,30 @@ def get_breadcrumbs(self) -> List[Breadcrumb]: class LogObjectList(ListView): template_name = "assessment/log_object_list.html" model = models.Log - paginate_by = 25 - def get_queryset(self): - qs = self.model.objects.filter(**self.kwargs) - if qs.count() == 0: + def dispatch(self, request, *args, **kwargs): + try: + content_type = ContentType.objects.get_for_id(kwargs["content_type"]) + except ObjectDoesNotExist: raise Http404() - self.first_log = qs[0] - self.assessment = qs[0].assessment - if not qs[0].user_can_view(self.request.user): + first_log = self.model.objects.filter(**self.kwargs).first() + if not first_log: + first_log = self.model(content_type=content_type, object_id=kwargs["object_id"]) + if hasattr(first_log.content_object, "get_assessment"): + first_log.assessment = first_log.content_object.get_assessment() + if not first_log.user_can_view(request.user): raise PermissionDenied() - return qs + + self.first_log = first_log + self.assessment = first_log.assessment + + return super().dispatch(request, *args, **kwargs) + + def get_queryset(self): + return self.model.objects.get_object_audit(**self.kwargs) def get_breadcrumbs(self) -> List[Breadcrumb]: - crumbs = Breadcrumb.build_crumbs( + return Breadcrumb.build_crumbs( self.request.user, "Logs", [ @@ -792,13 +802,12 @@ def get_breadcrumbs(self) -> List[Breadcrumb]: Breadcrumb(name="Logs", url=self.assessment.get_assessment_logs_url()), ], ) - return crumbs def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["first_log"] = self.first_log - context["assessment"] = self.assessment - context["breadcrumbs"] = self.get_breadcrumbs() + context.update(assessment=self.assessment, first_log=self.first_log) + if self.assessment: + context["breadcrumbs"] = self.get_breadcrumbs() return context diff --git a/hawc/apps/common/tasks.py b/hawc/apps/common/tasks.py index b4bc2b8831..0ef660fdf5 100644 --- a/hawc/apps/common/tasks.py +++ b/hawc/apps/common/tasks.py @@ -4,6 +4,7 @@ from celery.utils.log import get_task_logger from django.conf import settings from django.contrib.auth import get_user_model +from django.core.management import call_command from django.utils.timezone import now from rest_framework.authtoken.models import Token @@ -30,3 +31,14 @@ def destroy_old_api_tokens(): qs = Token.objects.filter(created__lt=deletion_date) logger.info(f"Destroying {qs.count()} old tokens") qs.delete() + + +@shared_task +def create_initial_revisions(): + """ + Most apis/views should create initial revisions; however if we're importing data from + other non-standard sources and we may have missed the initial revision, this task will ensure + that the revision has been created. We would lose the user who created it, but this is our + best effort as a fallback mechanism. + """ + call_command("createinitialrevisions", "reversion") diff --git a/hawc/apps/common/templatetags/hawc.py b/hawc/apps/common/templatetags/hawc.py new file mode 100644 index 0000000000..196d54977e --- /dev/null +++ b/hawc/apps/common/templatetags/hawc.py @@ -0,0 +1,15 @@ +""" +HAWC helper methods +""" +from django import template +from django.contrib.contenttypes.models import ContentType +from django.urls import reverse +from django.utils.safestring import mark_safe + +register = template.Library() + + +@register.simple_tag() +def audit_url(object): + ct = ContentType.objects.get_for_model(object.__class__) + return mark_safe(reverse("assessment:log_object_list", args=(ct.pk, object.pk))) diff --git a/hawc/apps/lit/models.py b/hawc/apps/lit/models.py index 51ac56ce7b..cf011ce9ba 100644 --- a/hawc/apps/lit/models.py +++ b/hawc/apps/lit/models.py @@ -20,6 +20,7 @@ from django.urls import reverse from django.utils import timezone from django.utils.html import strip_tags +from reversion import revisions as reversion from taggit.models import ItemBase from treebeard.mp_tree import MP_Node @@ -1021,3 +1022,6 @@ def extract_dois(cls, qs, logger=None, full_text: bool = False): logger.write( f"{n-n_doi:8} references remaining without a DOI ({(n-n_doi)/n:.0%} missing DOI)" ) + + +reversion.register(Reference) diff --git a/hawc/apps/summary/models.py b/hawc/apps/summary/models.py index c71143eff1..da120166fa 100644 --- a/hawc/apps/summary/models.py +++ b/hawc/apps/summary/models.py @@ -1027,6 +1027,7 @@ def copy_across_assessments(prefilters: str, cw: Dict) -> str: reversion.register(SummaryText) reversion.register(SummaryTable) +reversion.register(DataPivot) reversion.register(DataPivotUpload) reversion.register(DataPivotQuery) reversion.register(Visual) diff --git a/hawc/main/celery.py b/hawc/main/celery.py index 019c630b4c..850efa4093 100644 --- a/hawc/main/celery.py +++ b/hawc/main/celery.py @@ -31,6 +31,11 @@ def debug_task(self): "schedule": timedelta(minutes=10), "options": {"expires": timedelta(minutes=10).total_seconds()}, }, + "create-initial-revisions": { + "task": "hawc.apps.common.tasks.create_initial_revisions", + "schedule": timedelta(days=1), + "options": {"expires": timedelta(days=1).total_seconds()}, + }, "lit-schedule_topic_model_reruns-10-min": { "task": "hawc.apps.lit.tasks.schedule_topic_model_reruns", "schedule": timedelta(minutes=10),