ereuse/devicehub-django
8
0
Fork 0
Code Issues 6 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 +2 -2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3350966bb3 - Show all commits

2
device/templates/details.html
View file

@ -126,7 +126,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for a in object.get_user_annotations %} {% for a in object.get_user_properties %}
<tr> <tr>
<td>{{ a.key }}</td> <td>{{ a.key }}</td>
<td>{{ a.value }}</td> <td>{{ a.value }}</td>

2
device/views.py
View file

@ -12,7 +12,7 @@ from django.views.generic.edit import (
) )
from django.views.generic.base import TemplateView from django.views.generic.base import TemplateView
from dashboard.mixins import DashboardView, Http403 from dashboard.mixins import DashboardView, Http403
from evidence.models import UserProperty, SystemProperty from evidence.models import UserProperty, SystemProperty, Property
from lot.models import LotTag from lot.models import LotTag
from device.models import Device from device.models import Device
from device.forms import DeviceFormSet from device.forms import DeviceFormSet