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

less descriptor inspecion, more field inspection

Browse source
This commit is contained in:
Laura Klünder 2017-06-25 10:31:43 +02:00
parent c3018ea6a9
commit 877f0cafad
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/c3nav/editor/models/changeset.py
View file

@ -6,7 +6,6 @@ from django.conf import settings
from django.core.serializers.json import DjangoJSONEncoder
from django.db import models, transaction
from django.db.models import Q
from django.db.models.fields.related_descriptors import ForwardManyToOneDescriptor, ManyToManyDescriptor
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy
@ -305,21 +304,20 @@ class ChangeSet(models.Model):
obj.titles[name[6:]] = value
continue
class_value = getattr(model, name)
field = model._meta.get_field(name)
if isinstance(class_value, ManyToManyDescriptor):
if field.many_to_many:
continue
if isinstance(class_value, ForwardManyToOneDescriptor):
field = class_value.field
if field.many_to_one:
setattr(obj, field.attname, value)
if is_created_pk(value):
setattr(obj, class_value.cache_name, self.get_created_object(field.related_model, value))
setattr(obj, field.get_cache_name(), self.get_created_object(field.related_model, value))
elif get_foreign_objects:
setattr(obj, class_value.cache_name, self.wrap(field.related_model.objects.get(pk=value)))
setattr(obj, field.get_cache_name(), self.wrap(field.related_model.objects.get(pk=value)))
continue
setattr(obj, name, model._meta.get_field(name).to_python(value))
setattr(obj, name, field.to_python(value))
return self.wrap(obj, author=author)
def get_created_pks(self, model) -> set:

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

@ -166,9 +166,8 @@ def group_changes(changeset, can_edit=False, show_history=False):
field = obj.__class__._meta.get_field(change.field_name)
field_title = field.verbose_name
field_value = field.to_python(json.loads(change.field_value))
model = getattr(field, 'related_model', None)
if model is not None:
field_value = objects[model][field_value].title
if field.related_model is not None:
field_value = objects[field.related_model][field_value].title
order = 5
if change.field_name == 'slug':
order = 1