mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-09-12 01:03:09 +00:00
Add pretty representation of objects in InterfaceHistory
This commit is contained in:
parent
e0d0be2c9b
commit
9725da0307
1 changed files with 38 additions and 4 deletions
|
@ -28,10 +28,12 @@ from django.contrib.auth.models import Group
|
||||||
from machines.models import IpList
|
from machines.models import IpList
|
||||||
from machines.models import Interface
|
from machines.models import Interface
|
||||||
from machines.models import Machine
|
from machines.models import Machine
|
||||||
|
from machines.models import MachineType
|
||||||
from users.models import User
|
from users.models import User
|
||||||
from users.models import Adherent
|
from users.models import Adherent
|
||||||
from users.models import Club
|
from users.models import Club
|
||||||
from topologie.models import Room
|
from topologie.models import Room
|
||||||
|
from topologie.models import Port
|
||||||
|
|
||||||
|
|
||||||
class MachineHistorySearchEvent:
|
class MachineHistorySearchEvent:
|
||||||
|
@ -350,10 +352,7 @@ class UserHistoryEvent(HistoryEvent):
|
||||||
|
|
||||||
return ", ".join(users)
|
return ", ".join(users)
|
||||||
|
|
||||||
if value is None:
|
return super(UserHistoryEvent, self)._repr(name, value)
|
||||||
return _("None")
|
|
||||||
|
|
||||||
return value
|
|
||||||
|
|
||||||
def edits(self, hide=["password", "pwd_ntlm", "gpg_fingerprint"]):
|
def edits(self, hide=["password", "pwd_ntlm", "gpg_fingerprint"]):
|
||||||
"""
|
"""
|
||||||
|
@ -477,6 +476,41 @@ class InterfaceHistory(History):
|
||||||
|
|
||||||
return self.events[::-1]
|
return self.events[::-1]
|
||||||
|
|
||||||
|
def _repr(self, name, value):
|
||||||
|
"""
|
||||||
|
Returns the best representation of the given field
|
||||||
|
:param name: the name of the field
|
||||||
|
:param value: the value of the field
|
||||||
|
:return: object
|
||||||
|
"""
|
||||||
|
if name == "ipv4_id" and value is not None:
|
||||||
|
try:
|
||||||
|
return IpList.objects.get(id=value)
|
||||||
|
except IpList.DoesNotExist:
|
||||||
|
return "{} ({})".format(_("Deleted"), value)
|
||||||
|
elif name == "machine_type_id":
|
||||||
|
try:
|
||||||
|
return MachineType.objects.get(id=value).name
|
||||||
|
except MachineType.DoesNotExist:
|
||||||
|
return "{} ({})".format(_("Deleted"), value)
|
||||||
|
elif name == "machine_id":
|
||||||
|
try:
|
||||||
|
return Machine.objects.get(id=value).get_name() or _("No name")
|
||||||
|
except Machine.DoesNotExist:
|
||||||
|
return "{} ({})".format(_("Deleted"), value)
|
||||||
|
elif name == "port_lists":
|
||||||
|
if len(value) == 0:
|
||||||
|
return _("None")
|
||||||
|
|
||||||
|
ports = []
|
||||||
|
for pid in value:
|
||||||
|
try:
|
||||||
|
ports.append(Port.objects.get(id=pid).pretty_name())
|
||||||
|
except Group.DoesNotExist:
|
||||||
|
ports.append("{} ({})".format(_("Deleted"), pid))
|
||||||
|
|
||||||
|
return super(UserHistoryEvent, self)._repr(name, value)
|
||||||
|
|
||||||
def _add_revision(self, version):
|
def _add_revision(self, version):
|
||||||
"""
|
"""
|
||||||
Add a new revision to the chronological order
|
Add a new revision to the chronological order
|
||||||
|
|
Loading…
Reference in a new issue