ereuse/devicehub-django
8
0
Fork 0
Code Issues 5 Pull requests 6 Packages Projects Releases Wiki Activity

WIP: Changed annotation syntax to properties and created mutable user_properties #31

Closed
rskthomas wants to merge 27 commits from rework/properties into main
pull from: rework/properties
merge into: ereuse:main
Conversation 2 Commits 27 Files changed 28 +6 -6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a38475136f - Show all commits

12
evidence/forms.py
View file

@ -183,9 +183,9 @@ class EraseServerForm(forms.Form):
self.pk = None
self.uuid = kwargs.pop('uuid', None)
self.user = kwargs.pop('user')
instance = SystemProperty.objects.filter(
instance = UserProperty.objects.filter(
uuid=self.uuid,
type=SystemProperty.Type.ERASE_SERVER,
type=UserProperty.Type.ERASE_SERVER,
key='ERASE_SERVER',
owner=self.user.institution
).first()
@ -198,9 +198,9 @@ class EraseServerForm(forms.Form):
def clean(self):
self.erase_server = self.cleaned_data.get('erase_server', False)
self.instance = SystemProperty.objects.filter(
self.instance = UserProperty.objects.filter(
uuid=self.uuid,
type=Property.Type.ERASE_SERVER,
type=UserProperty.Type.ERASE_SERVER,
key='ERASE_SERVER',
owner=self.user.institution
).first()
@ -219,9 +219,9 @@ class EraseServerForm(forms.Form):
if self.instance:
return
SystemProperty.objects.create(
UserProperty.objects.create(
uuid=self.uuid,
type=Property.Type.ERASE_SERVER,
type=UserProperty.Type.ERASE_SERVER,
key='ERASE_SERVER',
value=self.erase_server,
owner=self.user.institution,