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

support for I18nField in orm wrapper

Browse source
This commit is contained in:
Laura Klünder 2017-11-30 13:42:28 +01:00
parent c012f0cde3
commit 08621fa6d0
3 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/c3nav/editor/models/changedobject.py
View file

@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _
from c3nav.editor.utils import is_created_pk
from c3nav.editor.wrappers import ModelInstanceWrapper
from c3nav.mapdata.fields import JSONField
from c3nav.mapdata.fields import I18nField, JSONField
from c3nav.mapdata.models.locations import LocationRedirect
@ -95,7 +95,7 @@ class ChangedObject(models.Model):
def add_relevant_object_pks(self, object_pks, many=True):
object_pks.setdefault(self.model_class, set()).add(self.obj_pk)
for name, value in self.updated_fields.items():
if name.startswith('title_'):
if '__i18n__' in name:
continue
field = self.model_class._meta.get_field(name)
if field.is_relation:
@ -135,11 +135,13 @@ class ChangedObject(models.Model):
def apply_to_instance(self, instance: ModelInstanceWrapper, created_pks=None):
for name, value in self.updated_fields.items():
if name.startswith('title_'):
if '__i18n__' in name:
name, i18n, lang = name.split('__')
field = instance._meta.get_field(name)
if not value:
instance.titles.pop(name[6:], None)
getattr(instance, field.attname).pop(lang, None)
else:
instance.titles[name[6:]] = value
getattr(instance, field.attname)[lang] = value
continue
field = instance._meta.get_field(name)
@ -182,8 +184,10 @@ class ChangedObject(models.Model):
delete_fields = set()
for name, new_value in self.updated_fields.items():
if name.startswith('title_'):
current_value = current_obj.titles.get(name[6:], '')
if '__i18n__' in name:
orig_name, i18n, lang = name.split('__')
field = self.model_class._meta.get_field(orig_name)
current_value = getattr(current_obj, field.attname).get(lang, '')
else:
field = self.model_class._meta.get_field(name)
@ -206,7 +210,7 @@ class ChangedObject(models.Model):
return False
for name, value in self.updated_fields.items():
if name.startswith('title_'):
if '__i18n__' in name:
continue
field = self.model_class._meta.get_field(name)
if field.is_relation:
@ -239,11 +243,11 @@ class ChangedObject(models.Model):
if not isinstance(field, Field) or field.primary_key:
continue
if not field.is_relation:
elif not field.is_relation:
value = getattr(instance, field.name)
if field.name == 'titles':
for lang, title in value.items():
self.updated_fields['title_'+lang] = title
if isinstance(field, I18nField):
for lang, subvalue in value.items():
self.updated_fields['%s__i18n__%s' % (field.name, lang)] = subvalue
elif isinstance(field, DecimalField):
self.updated_fields[field.name] = str(value)
else:

11
src/c3nav/editor/utils.py
View file

@ -16,16 +16,21 @@ def get_current_obj(model, pk, only_field=None):
def get_field_value(obj, field: Union[str, models.Field]):
lang = None
if isinstance(field, str):
name = field
model = type(obj)
field = model._meta.get_field('titles' if name.startswith('title_') else name)
if '__i18n__' in name:
orig_name, i18n, lang = name.split('__')
field = model._meta.get_field(orig_name)
else:
field = model._meta.get_field(name)
else:
name = field.name
try:
current_value = getattr(obj, field.attname)
except AttributeError:
current_value = field.to_prep_value(getattr(obj, field.name))
if name.startswith('title_'):
current_value = current_value.get(name[6:], '')
if lang:
current_value = current_value.get(lang, '')
return current_value

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

@ -243,7 +243,7 @@ def changeset_detail(request, pk):
'model_title': obj.__class__._meta.verbose_name,
'pk': changed_object.pk,
'desc': obj_desc,
'title': obj.title if getattr(obj, 'titles', None) else None,
'title': obj.title if getattr(obj, 'title', None) else None,
'changes': changes,
'edit_url': edit_url,
'deleted': changed_object.deleted,
@ -277,15 +277,18 @@ def changeset_detail(request, pk):
'order': (8,),
})
else:
if name.startswith('title_'):
lang = name[6:]
if '__i18n__' in name:
orig_name, i18n, lang = name.split('__')
lang_info = get_language_info(lang)
field_title = format_lazy(_('Title ({lang})'), lang=lang_info['name_translated'])
field = model._meta.get_field(orig_name)
field_title = format_lazy(_('{field_name} ({lang})'),
field_name=field.verbose_name,
lang=lang_info['name_translated'])
field_value = str(value)
if field_value:
obj.titles[lang] = field_value
getattr(obj, field.attname)[lang] = field_value
else:
obj.titles.pop(lang, None)
getattr(obj, field.attname).pop(lang, None)
change_data.update({
'order': (4, tuple(code for code, title in settings.LANGUAGES).index(lang)),
})