From 58f50b7ef2d038312d3896a2221f2714449cb17c Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 22 Mar 2012 13:44:54 +0000 Subject: [PATCH] Don't overwrite possible manual changes to existing name table entries when using name() to create/fetch name entries. - Legacy-Id: 4161 --- ietf/name/utils.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ietf/name/utils.py b/ietf/name/utils.py index 6480c8773..25b85ba4f 100644 --- a/ietf/name/utils.py +++ b/ietf/name/utils.py @@ -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