From 3562c5ef0664055fc8f4a9d65ebff79288b938b3 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Thu, 19 Sep 2013 11:02:24 +0000
Subject: [PATCH] Rewrite slightly to avoid using
 wgchairs.accounts.get_person_for_user  - Legacy-Id: 6194

---
 ietf/ietfworkflows/forms.py     | 6 ++++--
 ietf/secr/announcement/forms.py | 3 +--
 ietf/secr/announcement/views.py | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ietf/ietfworkflows/forms.py b/ietf/ietfworkflows/forms.py
index 7f9dd1fdf..c5cef4f57 100644
--- a/ietf/ietfworkflows/forms.py
+++ b/ietf/ietfworkflows/forms.py
@@ -7,7 +7,6 @@ from workflows.models import State
 from workflows.utils import set_workflow_for_object
 
 from ietf.idtracker.models import PersonOrOrgInfo, IETFWG, InternetDraft
-from ietf.wgchairs.accounts import get_person_for_user
 from ietf.ietfworkflows.models import Stream, StreamDelegate
 from ietf.ietfworkflows.utils import (get_workflow_for_draft, get_workflow_for_wg,
                                       get_state_for_draft, get_state_by_name,
@@ -33,7 +32,10 @@ class StreamDraftForm(forms.Form):
     def __init__(self, *args, **kwargs):
         self.draft = kwargs.pop('draft', None)
         self.user = kwargs.pop('user', None)
-        self.person = get_person_for_user(self.user)
+        try:
+            self.person = self.user.get_profile()
+        except:
+            self.person = None
         self.workflow = get_workflow_for_draft(self.draft)
         self.message = {}
         super(StreamDraftForm, self).__init__(*args, **kwargs)
diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py
index 64293c324..e74498d57 100644
--- a/ietf/secr/announcement/forms.py
+++ b/ietf/secr/announcement/forms.py
@@ -7,7 +7,6 @@ from ietf.secr.utils.group import current_nomcom
 
 from ietf.message.models import Message
 from ietf.ietfauth.decorators import has_role
-from ietf.wgchairs.accounts import get_person_for_user
 
 # ---------------------------------------------
 # Globals
@@ -158,7 +157,7 @@ class AnnounceForm(forms.ModelForm):
     def save(self, *args, **kwargs):
         user = kwargs.pop('user')
         message = super(AnnounceForm, self).save(commit=False)
-        message.by = get_person_for_user(user)
+        message.by = user.get_profile()
         if self.cleaned_data['to'] == 'Other...':
             message.to = self.cleaned_data['to_custom']
         if kwargs['commit']:
diff --git a/ietf/secr/announcement/views.py b/ietf/secr/announcement/views.py
index 8d6ba084c..c10ac692b 100644
--- a/ietf/secr/announcement/views.py
+++ b/ietf/secr/announcement/views.py
@@ -6,7 +6,6 @@ from django.template import RequestContext
 
 from ietf.ietfauth.decorators import has_role
 from ietf.utils.mail import send_mail_text
-from ietf.wgchairs.accounts import get_person_for_user
 from ietf.group.models import Group
 from ietf.secr.utils.group import current_nomcom
 from ietf.secr.utils.decorators import check_for_cancel
@@ -104,4 +103,4 @@ def confirm(request):
         'message': data,
         'to': to},
         RequestContext(request, {}),
-    )
\ No newline at end of file
+    )