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

Localization and several UI changes #51

Open
rskthomas wants to merge 55 commits from ux-changes_rebase into main
pull from: ux-changes_rebase
merge into: ereuse:main
Conversation 0 Commits 55 Files changed 46 +11 -6
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3ce3dcd362 - Show all commits

13
evidence/forms.py
View file

@ -71,6 +71,7 @@ class UserTagForm(forms.Form):
self.pk = None self.pk = None
self.uuid = kwargs.pop('uuid', None) self.uuid = kwargs.pop('uuid', None)
self.user = kwargs.pop('user') self.user = kwargs.pop('user')
instance = SystemProperty.objects.filter( instance = SystemProperty.objects.filter(
uuid=self.uuid, uuid=self.uuid,
key='CUSTOM_ID', key='CUSTOM_ID',
@ -88,6 +89,7 @@ class UserTagForm(forms.Form):
if not data: if not data:
return False return False
self.tag = data self.tag = data
self.instance = SystemProperty.objects.filter( self.instance = SystemProperty.objects.filter(
uuid=self.uuid, uuid=self.uuid,
key='CUSTOM_ID', key='CUSTOM_ID',
@ -103,13 +105,16 @@ class UserTagForm(forms.Form):
if self.instance: if self.instance:
old_value = self.instance.value old_value = self.instance.value
if not self.tag: if not self.tag:
message =_("<Deleted> Evidence Tag. Old Value: '{}'").format(old_value) message = _("<Deleted> Evidence Tag. Old Value: '{}'").format(
old_value
)
self.instance.delete() self.instance.delete()
else: else:
self.instance.value = self.tag self.instance.value = self.tag
self.instance.save() self.instance.save()
if old_value != self.tag: if old_value != self.tag:
message=_("<Updated> Evidence Tag. Old Value: '{}'. New Value: '{}'").format(old_value, self.tag) msg = "<Updated> Evidence Tag. Old Value: '{}'. New Value: '{}'"
message=_(msg).format(old_value, self.tag)
else: else:
message = _("<Created> Evidence Tag. Value: '{}'").format(self.tag) message = _("<Created> Evidence Tag. Value: '{}'").format(self.tag)
SystemProperty.objects.create( SystemProperty.objects.create(
@ -175,8 +180,8 @@ class ImportForm(forms.Form):
table = [] table = []
for row in self.rows: for row in self.rows:
doc = create_doc(row) doc = create_doc(row)
property = create_property(doc, self.user) prop = create_property(doc, self.user)
table.append((doc, property)) table.append((doc, prop))
if commit: if commit:
for doc, cred in table: for doc, cred in table: