Don't overwrite possible manual changes to existing name table entries when using name() to create/fetch name entries.

- Legacy-Id: 4161
This commit is contained in:
Henrik Levkowetz 2012-03-22 13:44:54 +00:00
parent 6eb2e7c78f
commit 58f50b7ef2

View file

@ -1,10 +1,11 @@
def name(name_class, slug, name, desc="", order=0, **kwargs):
# create if it doesn't exist, set name and desc
obj, _ = name_class.objects.get_or_create(slug=slug)
obj.name = name
obj.desc = desc
obj.order = order
for k, v in kwargs.iteritems():
setattr(obj, k, v)
obj.save()
obj, created = name_class.objects.get_or_create(slug=slug)
if created:
obj.name = name
obj.desc = desc
obj.order = order
for k, v in kwargs.iteritems():
setattr(obj, k, v)
obj.save()
return obj