2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix changeset view for wifi measurements

Browse source
This commit is contained in:
Laura Klünder 2017-12-21 02:44:12 +01:00
parent b625414cfa
commit 8f36b70f64
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/c3nav/editor/views/changes.py
View file

@ -3,6 +3,7 @@ from operator import itemgetter
from django.conf import settings from django.conf import settings
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.models import User
from django.core.cache import cache from django.core.cache import cache
from django.http import Http404 from django.http import Http404
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
@ -275,9 +276,16 @@ def changeset_detail(request, pk):
change_data.update({ change_data.update({
'icon': 'map-marker', 'icon': 'map-marker',
'class': 'info', 'class': 'info',
'title': _('edited geometry'), 'title': _('created geometry') if changed_object.is_created else _('edited geometry'),
'order': (8,), 'order': (8,),
}) })
elif name == 'data':
change_data.update({
'icon': 'signal',
'class': 'info',
'title': _('scan data created') if changed_object.is_created else _('scan data edited'),
'order': (9,),
})
else: else:
if '__i18n__' in name: if '__i18n__' in name:
orig_name, i18n, lang = name.split('__') orig_name, i18n, lang = name.split('__')
@ -299,6 +307,9 @@ def changeset_detail(request, pk):
field_title = field.verbose_name field_title = field.verbose_name
field_value = field.to_python(value) field_value = field.to_python(value)
if field.related_model is not None: if field.related_model is not None:
if issubclass(field.related_model, User):
field_value = objects[field.related_model][field_value].username
else:
field_value = objects[field.related_model][field_value].title field_value = objects[field.related_model][field_value].title
change_data.update({ change_data.update({
'missing_dependency': field.name in missing_dependencies, 'missing_dependency': field.name in missing_dependencies,