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

Add DocEvent and SubmissionEvent to merge-person-records.
 - Legacy-Id: 9197
Note: SVN reference [9185] has been migrated to Git commit cadf07fab3

ietf/bin/merge-person-records

@@ -18,12 +18,12 @@ from django.contrib.auth.models import User
 from ietf.person.models import Person
 
 parser = argparse.ArgumentParser()
-parser.add_argument("source",type=int)
-parser.add_argument("target",type=int)
+parser.add_argument("source_id",type=int)
+parser.add_argument("target_id",type=int)
 args = parser.parse_args()
 
-source = Person.objects.get(pk=args.source)
-target = Person.objects.get(pk=args.target)
+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)
 response = raw_input('Ok to continue y/n? ')
@@ -46,6 +46,16 @@ for alias in source.alias_set.all():
         alias.person = target
         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
 objs = [source]
 opts = Person._meta

ietf/urls.py

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

ietf/utils/management/commands/pyflakes.py

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