Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion localized_fields/descriptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __get__(self, instance, cls=None):

if self.field.name in instance.__dict__:
value = instance.__dict__[self.field.name]
elif instance.pk is not None:
elif not instance._state.adding:
instance.refresh_from_db(fields=[self.field.name])
value = getattr(instance, self.field.name)
else:
Expand Down
12 changes: 11 additions & 1 deletion tests/test_field.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json

from django.conf import settings
from django.db import models
from django.db.utils import IntegrityError
from django.test import TestCase

Expand Down Expand Up @@ -33,7 +34,6 @@ def test_init():
field = LocalizedField(required=False)
assert field.required == []


@staticmethod
def test_from_db_value():
"""Tests whether the :see:from_db_value function
Expand Down Expand Up @@ -205,6 +205,16 @@ def test_formfield():
for field in field.formfield().fields:
assert field.required

def test_descriptor_user_defined_primary_key(self):
"""Tests that descriptor works even when primary key is user defined."""
model = get_fake_model(dict(
slug=models.SlugField(primary_key=True),
title=LocalizedField()
))

obj = model.objects.create(slug='test', title='test')
assert obj.title == 'test'

def test_required_all(self):
"""Tests whether passing required=True properly validates
that all languages are filled in."""
Expand Down