altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Merged in [9699] from rcross@amsl.com:

Browse source 
Fix problem displaying non-ascii names.
 - Legacy-Id: 9704
Note: SVN reference [9699] has been migrated to Git commit 6ae71e5057
This commit is contained in:
Henrik Levkowetz 2015-07-09 12:15:42 +00:00
parent 4dbef4962b 6ae71e5057
commit 0ebc6a3a13
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/bin/merge-person-records
View file

@ -25,7 +25,7 @@ args = parser.parse_args()
source = Person.objects.get(pk=args.source_id)
target = Person.objects.get(pk=args.target_id)
print "Merging person {}({}) to {}({})".format(source.name,source.pk,target.name,target.pk)
print "Merging person {}({}) to {}({})".format(source.ascii,source.pk,target.ascii,target.pk)
response = raw_input('Ok to continue y/n? ')
if response.lower() != 'y':
sys.exit()
@ -72,10 +72,10 @@ deletable_objects, perms_needed, protected = admin.utils.get_deleted_objects(
objs, opts, user, admin_site, using)
if len(deletable_objects) > 1:
print "Not Deleting Person: {}({})".format(source.name,source.pk)
print "Not Deleting Person: {}({})".format(source.ascii,source.pk)
print "Related objects remain:"
pprint.pprint(deletable_objects[1])
else:
print "Deleting Person: {}({})".format(source.name,source.pk)
print "Deleting Person: {}({})".format(source.ascii,source.pk)
source.delete()