From caa2be3a419beb7417d68fede4b2e830c0ef33d9 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Thu, 14 Nov 2024 13:08:37 -0300 Subject: [PATCH] renaming to new Property tables --- evidence/forms.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/evidence/forms.py b/evidence/forms.py index 30611c1..3de1b6f 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -8,7 +8,7 @@ from utils.device import create_property, create_doc, create_index from utils.forms import MultipleFileField from device.models import Device from evidence.parse import Build -from evidence.models import SystemProperty +from evidence.models import SystemProperty, Property from utils.save_snapshots import move_json, save_in_disk @@ -68,9 +68,9 @@ class UserTagForm(forms.Form): self.pk = None self.uuid = kwargs.pop('uuid', None) self.user = kwargs.pop('user') - instance = Annotation.objects.filter( + instance = SystemProperty.objects.filter( uuid=self.uuid, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, key='CUSTOM_ID', owner=self.user.institution ).first() @@ -88,7 +88,7 @@ class UserTagForm(forms.Form): self.tag = data self.instance = SystemProperty.objects.filter( uuid=self.uuid, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, key='CUSTOM_ID', owner=self.user.institution ).first() @@ -186,9 +186,9 @@ class EraseServerForm(forms.Form): self.pk = None self.uuid = kwargs.pop('uuid', None) self.user = kwargs.pop('user') - instance = Annotation.objects.filter( + instance = SystemProperty.objects.filter( uuid=self.uuid, - type=Annotation.Type.ERASE_SERVER, + type=SystemProperty.Type.ERASE_SERVER, key='ERASE_SERVER', owner=self.user.institution ).first() @@ -201,9 +201,9 @@ class EraseServerForm(forms.Form): def clean(self): self.erase_server = self.cleaned_data.get('erase_server', False) - self.instance = Annotation.objects.filter( + self.instance = SystemProperty.objects.filter( uuid=self.uuid, - type=Annotation.Type.ERASE_SERVER, + type=Property.Type.ERASE_SERVER, key='ERASE_SERVER', owner=self.user.institution ).first() @@ -224,7 +224,7 @@ class EraseServerForm(forms.Form): SystemProperty.objects.create( uuid=self.uuid, - type=Annotation.Type.ERASE_SERVER, + type=Property.Type.ERASE_SERVER, key='ERASE_SERVER', value=self.erase_server, owner=self.user.institution,