diff --git a/Dockerfile b/Dockerfile index 5002c49b..b35f3078 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.7 MAINTAINER Patrowl.io "getsupport@patrowl.io" -LABEL Name="Patrowl Manager" Version="1.3.1" +LABEL Name="Patrowl Manager" Version="1.3.6" ENV PYTHONUNBUFFERED 1 RUN mkdir -p /opt/patrowl-manager/ diff --git a/VERSION b/VERSION index f3b11874..c198a222 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.5 // Community Edition +1.3.6 // Community Edition diff --git a/events/models.py b/events/models.py index 4a3fe9bb..c378d825 100644 --- a/events/models.py +++ b/events/models.py @@ -29,9 +29,12 @@ class Event(models.Model): type = models.CharField(choices=EVENT_TYPES, default='UNSPECIFIED', max_length=15) severity = models.CharField(choices=SEVERITY_LEVELS, default='INFO', max_length=10) code = models.CharField(max_length=10, null=True, blank=True) - scan = models.ForeignKey('scans.Scan', null=True, blank=True, on_delete=models.SET_NULL, related_name="event_scan") - finding = models.ForeignKey('findings.Finding', null=True, blank=True, on_delete=models.SET_NULL, related_name="event_finding") - rawfinding = models.ForeignKey('findings.RawFinding', null=True, blank=True, on_delete=models.SET_NULL, related_name="event_rawfinding") + scan = models.ForeignKey('scans.Scan', null=True, blank=True, on_delete=models.SET_NULL) + finding = models.ForeignKey('findings.Finding', null=True, blank=True, on_delete=models.SET_NULL) + rawfinding = models.ForeignKey('findings.RawFinding', null=True, blank=True, on_delete=models.SET_NULL) + # scan = models.ForeignKey('scans.Scan', null=True, blank=True, on_delete=models.SET_NULL, related_name="event_scan") + # finding = models.ForeignKey('findings.Finding', null=True, blank=True, on_delete=models.SET_NULL, related_name="event_finding") + # rawfinding = models.ForeignKey('findings.RawFinding', null=True, blank=True, on_delete=models.SET_NULL, related_name="event_rawfinding") created_at = models.DateTimeField(default=timezone.now) updated_at = models.DateTimeField(default=timezone.now) diff --git a/requirements.txt b/requirements.txt index 7cc822ef..7df0bcf8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ certifi==2017.4.17 chardet==3.0.4 coreapi==2.3.3 coreschema==0.0.4 -Django==2.2.12 +Django==2.2.13 django-celery-beat==1.1.1 django-celery-results==1.1.2 django-cursor-pagination==0.1.4