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

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

Browse source 
Add DocEvent and SubmissionEvent to merge-person-records.
 - Legacy-Id: 9197
Note: SVN reference [9185] has been migrated to Git commit cadf07fab3
This commit is contained in:
Henrik Levkowetz 2015-03-14 15:47:24 +00:00
parent 0169cd67e7 cadf07fab3
commit 4b80218548
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,12 +18,12 @@ from django.contrib.auth.models import User
from ietf.person.models import Person from ietf.person.models import Person
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("source",type=int) parser.add_argument("source_id",type=int)
parser.add_argument("target",type=int) parser.add_argument("target_id",type=int)
args = parser.parse_args() args = parser.parse_args()
source = Person.objects.get(pk=args.source) source = Person.objects.get(pk=args.source_id)
target = Person.objects.get(pk=args.target) 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.name,source.pk,target.name,target.pk)
response = raw_input('Ok to continue y/n? ') response = raw_input('Ok to continue y/n? ')
@ -46,6 +46,16 @@ for alias in source.alias_set.all():
alias.person = target alias.person = target
alias.save() alias.save()
# merge DocEvents
for docevent in source.docevent_set.all():
docevent.by = target
docevent.save()
# merge SubmissionEvents
for subevent in source.submissionevent_set.all():
subevent.by = target
subevent.save()
# check for any remaining relationships and delete if none # check for any remaining relationships and delete if none
objs = [source] objs = [source]
opts = Person._meta opts = Person._meta

3
ietf/urls.py
View file

@ -46,8 +46,7 @@ urlpatterns = patterns('',
(r'^meeting/', include('ietf.meeting.urls')), (r'^meeting/', include('ietf.meeting.urls')),
(r'^nomcom/', include('ietf.nomcom.urls')), (r'^nomcom/', include('ietf.nomcom.urls')),
(r'^person/', include('ietf.person.urls')), (r'^person/', include('ietf.person.urls')),
(r'^release/$', 'ietf.release.views.release'), (r'^release/', include('ietf.release.urls)),
(r'^release/(?P<version>.+)/$', 'ietf.release.views.release'),
(r'^secr/', include('ietf.secr.urls')), (r'^secr/', include('ietf.secr.urls')),
(r'^sitemap-(?P<section>.+).xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}), (r'^sitemap-(?P<section>.+).xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
(r'^sitemap.xml$', 'django.contrib.sitemaps.views.index', { 'sitemaps': sitemaps}), (r'^sitemap.xml$', 'django.contrib.sitemaps.views.index', { 'sitemaps': sitemaps}),

2
ietf/utils/management/commands/pyflakes.py
View file

@ -119,4 +119,4 @@ class Command(BaseCommand):
if warnings: if warnings:
print 'Total warnings: %d' % len(warnings) print 'Total warnings: %d' % len(warnings)
raise SystemExit(1) raise SystemExit(1)