From 7f277a8fbba7b23bdddb71e5a51f9641cd16accb Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Wed, 18 Dec 2013 10:13:40 +0000 Subject: [PATCH] Replace user.get_profile() with user.person, the profile stuff is deprecated since Django 1.5 - Legacy-Id: 6968 --- ietf/community/models.py | 2 +- ietf/community/templatetags/community_tags.py | 2 +- ietf/doc/lastcall.py | 2 +- ietf/doc/mails.py | 6 +-- ietf/doc/views_ballot.py | 20 ++++----- ietf/doc/views_conflict_review.py | 14 +++--- ietf/doc/views_doc.py | 2 +- ietf/doc/views_draft.py | 44 +++++++++---------- ietf/doc/views_status_change.py | 20 ++++----- ietf/group/views_stream.py | 2 +- ietf/iesg/views.py | 2 +- ietf/ietfauth/utils.py | 2 +- ietf/ietfauth/views.py | 2 +- ietf/liaisons/accounts.py | 2 +- ietf/meeting/ajax.py | 6 +-- ietf/meeting/helpers.py | 2 +- ietf/meeting/views.py | 4 +- ietf/secr/announcement/forms.py | 6 +-- ietf/secr/announcement/views.py | 2 +- ietf/secr/areas/views.py | 6 +-- ietf/secr/drafts/views.py | 28 ++++++------ ietf/secr/groups/views.py | 6 +-- ietf/secr/meetings/views.py | 2 +- ietf/secr/proceedings/views.py | 12 ++--- ietf/secr/sreq/views.py | 12 ++--- ietf/secr/telechat/views.py | 2 +- ietf/secr/utils/decorators.py | 4 +- ietf/secr/utils/group.py | 2 +- ietf/settings.py | 3 +- ietf/submit/mail.py | 2 +- ietf/submit/views.py | 2 +- ietf/templates/base/left_menu.html | 2 +- ietf/wgcharter/mails.py | 2 +- ietf/wgcharter/views.py | 16 +++---- ietf/wginfo/edit.py | 4 +- ietf/wginfo/milestones.py | 4 +- 36 files changed, 125 insertions(+), 126 deletions(-) diff --git a/ietf/community/models.py b/ietf/community/models.py index 13b0fd315..5372f4319 100644 --- a/ietf/community/models.py +++ b/ietf/community/models.py @@ -30,7 +30,7 @@ class CommunityList(models.Model): if not self.group or self.group.type.slug not in ('area', 'wg'): return False try: - person = user.get_profile() + person = user.person except: return False if self.group.type.slug == 'area': diff --git a/ietf/community/templatetags/community_tags.py b/ietf/community/templatetags/community_tags.py index 5addac178..639b9eb87 100644 --- a/ietf/community/templatetags/community_tags.py +++ b/ietf/community/templatetags/community_tags.py @@ -20,7 +20,7 @@ class CommunityListNode(template.Node): return '' lists = {'personal': CommunityList.objects.get_or_create(user=user)[0]} try: - person = user.get_profile() + person = user.person groups = [] managed_areas = [i.group for i in Role.objects.filter(name__slug='ad', email__in=person.email_set.all())] for area in managed_areas: diff --git a/ietf/doc/lastcall.py b/ietf/doc/lastcall.py index a605e730e..68f47681d 100644 --- a/ietf/doc/lastcall.py +++ b/ietf/doc/lastcall.py @@ -21,7 +21,7 @@ def request_last_call(request, doc): e = DocEvent() e.type = "requested_last_call" - e.by = request.user.get_profile() + e.by = request.user.person e.doc = doc e.desc = "Last call was requested" e.save() diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py index 54242c747..6a0466f9b 100644 --- a/ietf/doc/mails.py +++ b/ietf/doc/mails.py @@ -90,7 +90,7 @@ def generate_ballot_writeup(request, doc): e = WriteupDocEvent() e.type = "changed_ballot_writeup_text" - e.by = request.user.get_profile() + e.by = request.user.person e.doc = doc e.desc = u"Ballot writeup was generated" e.text = unicode(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana})) @@ -132,7 +132,7 @@ def generate_last_call_announcement(request, doc): e = WriteupDocEvent() e.type = "changed_last_call_text" - e.by = request.user.get_profile() + e.by = request.user.person e.doc = doc e.desc = u"Last call announcement was generated" e.text = unicode(mail) @@ -151,7 +151,7 @@ def generate_approval_mail(request, doc): e = WriteupDocEvent() e.type = "changed_ballot_approval_text" - e.by = request.user.get_profile() + e.by = request.user.person e.doc = doc e.desc = u"Ballot approval text was generated" e.text = unicode(mail) diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py index 41468a149..8cd0c34ea 100644 --- a/ietf/doc/views_ballot.py +++ b/ietf/doc/views_ballot.py @@ -45,7 +45,7 @@ def do_undefer_ballot(request, doc): Helper function to perform undefer of ballot. Takes the Request object, for use in logging, and the Document object. ''' - login = request.user.get_profile() + login = request.user.person telechat_date = TelechatDate.objects.active().order_by("date")[0].date save_document_in_history(doc) @@ -113,7 +113,7 @@ def edit_position(request, name, ballot_id): doc = get_object_or_404(Document, docalias__name=name) ballot = get_object_or_404(BallotDocEvent, type="created_ballot", pk=ballot_id, doc=doc) - ad = login = request.user.get_profile() + ad = login = request.user.person if 'HTTP_REFERER' in request.META: return_to_url = request.META['HTTP_REFERER'] @@ -249,7 +249,7 @@ def send_ballot_comment(request, name, ballot_id): doc = get_object_or_404(Document, docalias__name=name) ballot = get_object_or_404(BallotDocEvent, type="created_ballot", pk=ballot_id, doc=doc) - ad = login = request.user.get_profile() + ad = login = request.user.person return_to_url = request.GET.get('return_to_url') if not return_to_url: @@ -325,7 +325,7 @@ def clear_ballot(request, name): """Clear all positions and discusses on every open ballot for a document.""" doc = get_object_or_404(Document, name=name) if request.method == 'POST': - by = request.user.get_profile() + by = request.user.person for t in BallotType.objects.filter(doc_type=doc.type_id): close_ballot(doc, by, t.slug) create_ballot_if_not_open(doc, by, t.slug) @@ -347,7 +347,7 @@ def defer_ballot(request, name): if doc.type_id == 'draft' and not doc.get_state("draft-iesg"): raise Http404() - login = request.user.get_profile() + login = request.user.person telechat_date = TelechatDate.objects.active().order_by("date")[1].date if request.method == 'POST': @@ -421,7 +421,7 @@ def lastcalltext(request, name): if not doc.get_state("draft-iesg"): raise Http404() - login = request.user.get_profile() + login = request.user.person existing = doc.latest_event(WriteupDocEvent, type="changed_last_call_text") if not existing: @@ -504,7 +504,7 @@ def ballot_writeupnotes(request, name): """Editing of ballot write-up and notes""" doc = get_object_or_404(Document, docalias__name=name) - login = request.user.get_profile() + login = request.user.person existing = doc.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text") if not existing: @@ -585,7 +585,7 @@ def ballot_approvaltext(request, name): if not doc.get_state("draft-iesg"): raise Http404() - login = request.user.get_profile() + login = request.user.person existing = doc.latest_event(WriteupDocEvent, type="changed_ballot_approval_text") if not existing: @@ -633,7 +633,7 @@ def approve_ballot(request, name): if not doc.get_state("draft-iesg"): raise Http404() - login = request.user.get_profile() + login = request.user.person e = doc.latest_event(WriteupDocEvent, type="changed_ballot_approval_text") if not e: @@ -742,7 +742,7 @@ def make_last_call(request, name): if not (doc.get_state("draft-iesg") or doc.get_state("statchg")): raise Http404 - login = request.user.get_profile() + login = request.user.person e = doc.latest_event(WriteupDocEvent, type="changed_last_call_text") if not e: diff --git a/ietf/doc/views_conflict_review.py b/ietf/doc/views_conflict_review.py index 9bdb75a00..50fe6f5c0 100644 --- a/ietf/doc/views_conflict_review.py +++ b/ietf/doc/views_conflict_review.py @@ -35,7 +35,7 @@ def change_state(request, name, option=None): and logging the change as a comment.""" review = get_object_or_404(Document, type="conflrev", name=name) - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = ChangeStateForm(request.POST) @@ -126,7 +126,7 @@ class UploadForm(forms.Form): def submit(request, name): review = get_object_or_404(Document, type="conflrev", name=name) - login = request.user.get_profile() + login = request.user.person path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.canonical_name(), review.rev)) not_uploaded_yet = review.rev == "00" and not os.path.exists(path) @@ -209,7 +209,7 @@ def edit_notices(request, name): review.notify = form.cleaned_data['notify'] review.save() - login = request.user.get_profile() + login = request.user.person c = DocEvent(type="added_comment", doc=review, by=login) c.desc = "Notification list changed to : "+review.notify c.save() @@ -243,7 +243,7 @@ def edit_ad(request, name): review.ad = form.cleaned_data['ad'] review.save() - login = request.user.get_profile() + login = request.user.person c = DocEvent(type="added_comment", doc=review, by=login) c.desc = "Shepherding AD changed to "+review.ad.name c.save() @@ -300,7 +300,7 @@ def approve(request, name): if review.get_state('conflrev').slug not in ('appr-reqnopub-pend','appr-noprob-pend'): raise Http404 - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': @@ -380,7 +380,7 @@ def start_review(request, name): if [ rel.source for alias in doc_to_review.docalias_set.all() for rel in alias.relateddocument_set.filter(relationship='conflrev') ]: raise Http404 - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': @@ -448,7 +448,7 @@ def start_review(request, name): @role_required("Area Director", "Secretariat") def telechat_date(request, name): doc = get_object_or_404(Document, type="conflrev", name=name) - login = request.user.get_profile() + login = request.user.person e = doc.latest_event(TelechatDocEvent, type="scheduled_for_telechat") initial_returning_item = bool(e and e.returning_item) diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index 99c24fed7..677a58e75 100644 --- a/ietf/doc/views_doc.py +++ b/ietf/doc/views_doc.py @@ -745,7 +745,7 @@ def add_comment(request, name): """Add comment to history of document.""" doc = get_object_or_404(Document, docalias__name=name) - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = AddCommentForm(request.POST) diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py index ed975b7bb..15337c5d9 100644 --- a/ietf/doc/views_draft.py +++ b/ietf/doc/views_draft.py @@ -63,7 +63,7 @@ def change_state(request, name): if (not doc.latest_event(type="started_iesg_process")) or doc.get_state_slug() == "expired": raise Http404() - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = ChangeStateForm(request.POST) @@ -186,7 +186,7 @@ def change_iana_state(request, name, state_type): doc.set_state(next_state) - e = add_state_change_event(doc, request.user.get_profile(), prev_state, next_state) + e = add_state_change_event(doc, request.user.person, prev_state, next_state) doc.time = e.time doc.save() @@ -222,7 +222,7 @@ def change_stream(request, name): person__user=request.user))): return HttpResponseForbidden("You do not have permission to view this page") - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = ChangeStreamForm(request.POST) @@ -341,7 +341,7 @@ def replaces(request, name): if not (has_role(request.user, ("Secretariat", "Area Director")) or is_authorized_in_doc_stream(request.user, doc)): return HttpResponseForbidden("You do not have the necessary permissions to view this page") - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = ReplacesForm(request.POST, doc=doc) if form.is_valid(): @@ -418,7 +418,7 @@ def change_intention(request, name): or is_authorized_in_doc_stream(request.user, doc)): return HttpResponseForbidden("You do not have the necessary permissions to view this page") - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = ChangeIntentionForm(request.POST) @@ -546,7 +546,7 @@ def to_iesg(request,name): save_document_in_history(doc) - login = request.user.get_profile() + login = request.user.person changes = [] @@ -621,7 +621,7 @@ def edit_info(request, name): if doc.get_state_slug() == "expired": raise Http404() - login = request.user.get_profile() + login = request.user.person new_document = False if not doc.get_state("draft-iesg"): # FIXME: should probably receive "new document" as argument to view instead of this @@ -771,7 +771,7 @@ def request_resurrect(request, name): if doc.get_state_slug() != "expired": raise Http404() - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': email_resurrect_requested(request, doc, login) @@ -795,7 +795,7 @@ def resurrect(request, name): if doc.get_state_slug() != "expired": raise Http404() - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': save_document_in_history(doc) @@ -839,7 +839,7 @@ def edit_notices(request, name): doc.notify = form.cleaned_data['notify'] doc.save() - login = request.user.get_profile() + login = request.user.person c = DocEvent(type="added_comment", doc=doc, by=login) c.desc = "Notification list changed to : "+doc.notify c.save() @@ -884,7 +884,7 @@ class TelechatForm(forms.Form): @role_required("Area Director", "Secretariat") def telechat_date(request, name): doc = get_object_or_404(Document, type="draft", name=name) - login = request.user.get_profile() + login = request.user.person e = doc.latest_event(TelechatDocEvent, type="scheduled_for_telechat") initial_returning_item = bool(e and e.returning_item) @@ -920,7 +920,7 @@ class IESGNoteForm(forms.Form): @role_required("Area Director", "Secretariat") def edit_iesg_note(request, name): doc = get_object_or_404(Document, type="draft", name=name) - login = request.user.get_profile() + login = request.user.person initial = dict(note=doc.note) @@ -976,7 +976,7 @@ def edit_shepherd_writeup(request, name): if not can_edit_shepherd_writeup: return HttpResponseForbidden("You do not have the necessary permissions to view this page") - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': if "submit_response" in request.POST: @@ -1062,7 +1062,7 @@ def edit_shepherd(request, name): doc.shepherd = None doc.save() - login = request.user.get_profile() + login = request.user.person c = DocEvent(type="added_comment", doc=doc, by=login) c.desc = "Document shepherd changed to "+ (doc.shepherd.name if doc.shepherd else "(None)") c.save() @@ -1110,7 +1110,7 @@ def edit_ad(request, name): doc.ad = form.cleaned_data['ad'] doc.save() - login = request.user.get_profile() + login = request.user.person c = DocEvent(type="added_comment", doc=doc, by=login) c.desc = "Shepherding AD changed to "+doc.ad.name c.save() @@ -1146,7 +1146,7 @@ def edit_consensus(request, name): form = ConsensusForm(request.POST) if form.is_valid(): if form.cleaned_data["consensus"] != bool(prev_consensus): - e = ConsensusDocEvent(doc=doc, type="changed_consensus", by=request.user.get_profile()) + e = ConsensusDocEvent(doc=doc, type="changed_consensus", by=request.user.person) e.consensus = form.cleaned_data["consensus"] == "Yes" e.desc = "Changed consensus to %s from %s" % (nice_consensus(e.consensus), @@ -1179,9 +1179,9 @@ def request_publication(request, name): return HttpResponseForbidden("You do not have the necessary permissions to view this page") m = Message() - m.frm = request.user.get_profile().formatted_email() + m.frm = request.user.person.formatted_email() m.to = "RFC Editor " - m.by = request.user.get_profile() + m.by = request.user.person next_state = State.objects.get(used=True, type="draft-stream-%s" % doc.stream.slug, slug="rfc-edit") @@ -1213,7 +1213,7 @@ def request_publication(request, name): m.to = settings.IANA_APPROVE_EMAIL send_mail_message(request, m, extra=extra_automation_headers(doc)) - e = DocEvent(doc=doc, type="requested_publication", by=request.user.get_profile()) + e = DocEvent(doc=doc, type="requested_publication", by=request.user.person) e.desc = "Sent request for publication to the RFC Editor" e.save() @@ -1221,7 +1221,7 @@ def request_publication(request, name): prev_state = doc.get_state(next_state.type) if next_state != prev_state: doc.set_state(next_state) - e = add_state_change_event(doc, request.user.get_profile(), prev_state, next_state) + e = add_state_change_event(doc, request.user.person, prev_state, next_state) doc.time = e.time doc.save() @@ -1280,7 +1280,7 @@ def adopt_draft(request, name): if form.is_valid(): # adopt - by = request.user.get_profile() + by = request.user.person save_document_in_history(doc) @@ -1409,7 +1409,7 @@ def change_stream_state(request, name, state_type): if request.method == 'POST': form = ChangeStreamStateForm(request.POST, doc=doc, state_type=state_type) if form.is_valid(): - by = request.user.get_profile() + by = request.user.person save_document_in_history(doc) diff --git a/ietf/doc/views_status_change.py b/ietf/doc/views_status_change.py index 3c6ad7453..a28eaacca 100644 --- a/ietf/doc/views_status_change.py +++ b/ietf/doc/views_status_change.py @@ -37,7 +37,7 @@ def change_state(request, name, option=None): and logging the change as a comment.""" status_change = get_object_or_404(Document, type="statchg", name=name) - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = ChangeStateForm(request.POST) @@ -128,7 +128,7 @@ class UploadForm(forms.Form): def submit(request, name): doc = get_object_or_404(Document, type="statchg", name=name) - login = request.user.get_profile() + login = request.user.person path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) not_uploaded_yet = doc.rev == "00" and not os.path.exists(path) @@ -209,7 +209,7 @@ def edit_notices(request, name): status_change.notify = form.cleaned_data['notify'] status_change.save() - login = request.user.get_profile() + login = request.user.person c = DocEvent(type="added_comment", doc=status_change, by=login) c.desc = "Notification list changed to : "+status_change.notify c.save() @@ -241,7 +241,7 @@ def edit_ad(request, name): status_change.ad = form.cleaned_data['ad'] status_change.save() - login = request.user.get_profile() + login = request.user.person c = DocEvent(type="added_comment", doc=status_change, by=login) c.desc = "Shepherding AD changed to "+status_change.ad.name c.save() @@ -315,7 +315,7 @@ def approve(request, name): if status_change.get_state('statchg').slug not in ('appr-pend'): raise Http404 - login = request.user.get_profile() + login = request.user.person AnnouncementFormSet = formset_factory(AnnouncementForm,extra=0) @@ -498,7 +498,7 @@ def start_rfc_status_change(request,name): raise Http404 seed_rfc = get_object_or_404(Document, type="draft", docalias__name=name) - login = request.user.get_profile() + login = request.user.person relation_slugs = DocRelationshipName.objects.filter(slug__in=RELATION_SLUGS) @@ -552,7 +552,7 @@ def start_rfc_status_change(request,name): @role_required("Area Director", "Secretariat") def telechat_date(request, name): doc = get_object_or_404(Document, type="statchg", name=name) - login = request.user.get_profile() + login = request.user.person e = doc.latest_event(TelechatDocEvent, type="scheduled_for_telechat") initial_returning_item = bool(e and e.returning_item) @@ -582,7 +582,7 @@ def edit_relations(request, name): status_change = get_object_or_404(Document, type="statchg", name=name) - login = request.user.get_profile() + login = request.user.person relation_slugs = DocRelationshipName.objects.filter(slug__in=RELATION_SLUGS) @@ -651,7 +651,7 @@ def generate_last_call_text(request, doc): e = WriteupDocEvent() e.type = 'changed_last_call_text' - e.by = request.user.get_profile() + e.by = request.user.person e.doc = doc e.desc = 'Last call announcement was generated' e.text = unicode(new_text) @@ -665,7 +665,7 @@ def last_call(request, name): status_change = get_object_or_404(Document, type="statchg", name=name) - login = request.user.get_profile() + login = request.user.person last_call_event = status_change.latest_event(WriteupDocEvent, type="changed_last_call_text") if not last_call_event: diff --git a/ietf/group/views_stream.py b/ietf/group/views_stream.py index 8795f2306..f949f3bb5 100644 --- a/ietf/group/views_stream.py +++ b/ietf/group/views_stream.py @@ -56,7 +56,7 @@ def stream_edit(request, acronym): desc = "%s changed to %s from %s" % ( title, ", ".join(x.get_name() for x in new), ", ".join(x.get_name() for x in old)) - GroupEvent.objects.create(group=group, by=request.user.get_profile(), type="info_changed", desc=desc) + GroupEvent.objects.create(group=group, by=request.user.person, type="info_changed", desc=desc) group.role_set.filter(name=slug).delete() for e in new: diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index 045a88604..3242e27ad 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -320,7 +320,7 @@ def handle_reschedule_form(request, doc, dates, status): if request.method == 'POST': form = RescheduleForm(request.POST, **formargs) if form.is_valid(): - update_telechat(request, doc, request.user.get_profile(), + update_telechat(request, doc, request.user.person, form.cleaned_data['telechat_date'], False if form.cleaned_data['clear_returning_item'] else None) doc.time = datetime.datetime.now() diff --git a/ietf/ietfauth/utils.py b/ietf/ietfauth/utils.py index 1569934ad..13bef2fdf 100644 --- a/ietf/ietfauth/utils.py +++ b/ietf/ietfauth/utils.py @@ -37,7 +37,7 @@ def has_role(user, role_names, *args, **kwargs): key = frozenset(role_names) if key not in user.roles_check_cache: try: - person = user.get_profile() + person = user.person except Person.DoesNotExist: return False diff --git a/ietf/ietfauth/views.py b/ietf/ietfauth/views.py index f23e8b8ae..f121ab6d4 100644 --- a/ietf/ietfauth/views.py +++ b/ietf/ietfauth/views.py @@ -85,7 +85,7 @@ def profile(request): roles = [] person = None try: - person = request.user.get_profile() + person = request.user.person except Person.DoesNotExist: return render_to_response('registration/missing_person.html', context_instance=RequestContext(request)) diff --git a/ietf/liaisons/accounts.py b/ietf/liaisons/accounts.py index a86cc33fd..aa28a2723 100644 --- a/ietf/liaisons/accounts.py +++ b/ietf/liaisons/accounts.py @@ -47,7 +47,7 @@ def get_person_for_user(user): if not user.is_authenticated(): return None try: - p = user.get_profile() + p = user.person p.email = lambda: (p.plain_name(), p.email_address()) return p except Person.DoesNotExist: diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index 846fc8f03..90c26803f 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -34,7 +34,7 @@ def readonly(request, meeting_num, schedule_id): write_perm = True try: - person = user.get_profile() + person = user.person if person is not None and schedule.owner == user.person: read_only = False except: @@ -80,7 +80,7 @@ def update_timeslot(request, schedule_id, session_id, scheduledsession_id=None, ess = None ss = None - #print "duplicate: %s schedule.owner: %s user: %s" % (duplicate, schedule.owner, request.user.get_profile()) + #print "duplicate: %s schedule.owner: %s user: %s" % (duplicate, schedule.owner, request.user.person) cansee,canedit = agenda_permissions(meeting, schedule, request.user) if not canedit: @@ -305,7 +305,7 @@ def agenda_add(request, meeting): newagenda = newagendaform.save(commit=False) newagenda.meeting = meeting - newagenda.owner = request.user.get_profile() + newagenda.owner = request.user.person newagenda.save() if "HTTP_ACCEPT" in request.META and "application/json" in request.META['HTTP_ACCEPT']: diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py index b364a81a6..573c0f37d 100644 --- a/ietf/meeting/helpers.py +++ b/ietf/meeting/helpers.py @@ -147,7 +147,7 @@ def agenda_permissions(meeting, schedule, user): requestor= None try: - requestor = user.get_profile() + requestor = user.person except: pass diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index c37805fde..4a9628476 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -210,7 +210,7 @@ def edit_agenda(request, num=None, schedule_name=None): if not user.is_anonymous(): #print "user: %s" % (user) try: - requestor = user.get_profile() + requestor = user.person except Person.DoesNotExist: # if we can not find them, leave them alone, only used for debugging. pass @@ -319,7 +319,7 @@ def edit_agendas(request, num=None, order=None): schedules = meeting.schedule_set if not has_role(user, 'Secretariat'): - schedules = schedules.filter(visible = True) | schedules.filter(owner = user.get_profile()) + schedules = schedules.filter(visible = True) | schedules.filter(owner = user.person) schedules = schedules.order_by('owner', 'name') diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py index a22a35e74..ae37f31d7 100644 --- a/ietf/secr/announcement/forms.py +++ b/ietf/secr/announcement/forms.py @@ -81,7 +81,7 @@ def get_from_choices(user): all the Announced From choices. Including leadership chairs and other entities. ''' - person = user.get_profile() + person = user.person if has_role(user,'Secretariat'): f = FROM_LIST elif has_role(user,'IETF Chair'): @@ -154,7 +154,7 @@ class AnnounceForm(forms.ModelForm): def __init__(self, *args, **kwargs): user = kwargs.pop('user') - person = user.get_profile() + person = user.person super(AnnounceForm, self).__init__(*args, **kwargs) self.fields['to'].widget = forms.Select(choices=TO_CHOICES) self.fields['to'].help_text = 'Select name OR select Other... and enter email below' @@ -183,7 +183,7 @@ class AnnounceForm(forms.ModelForm): def save(self, *args, **kwargs): user = kwargs.pop('user') message = super(AnnounceForm, self).save(commit=False) - message.by = user.get_profile() + message.by = user.person 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 1faa57b3b..ed37f5e59 100644 --- a/ietf/secr/announcement/views.py +++ b/ietf/secr/announcement/views.py @@ -21,7 +21,7 @@ def check_access(user): Announcement app. Accepted roles are: Secretariat, IAD, IAB Chair, IETF Chair, RSOC Chair, IAOC Chair, NomCom Chair, RSE Chair ''' - person = user.get_profile() + person = user.person groups_with_access = ("iab", "rsoc", "ietf", "iaoc", "rse", "mentor") if Role.objects.filter(person=person, group__acronym__in=groups_with_access, diff --git a/ietf/secr/areas/views.py b/ietf/secr/areas/views.py index 5761c5598..fd5ed17bf 100644 --- a/ietf/secr/areas/views.py +++ b/ietf/secr/areas/views.py @@ -75,7 +75,7 @@ def add(request): #save groupevent 'started' record start_date = area_form.cleaned_data.get('start_date') - login = request.user.get_profile() + login = request.user.person group_event = GroupEvent(group=area,time=start_date,type='started',by=login) group_event.save() @@ -134,7 +134,7 @@ def edit(request, name): if 'state' in form.changed_data: ChangeStateGroupEvent.objects.create(group=new_area, type='changed_state', - by=request.user.get_profile(), + by=request.user.person, state=state, time=new_area.time) form.changed_data.remove('state') @@ -143,7 +143,7 @@ def edit(request, name): if form.changed_data: GroupEvent.objects.create(group=new_area, type='info_changed', - by=request.user.get_profile(), + by=request.user.person, time=new_area.time) messages.success(request, 'The Area entry was changed successfully') diff --git a/ietf/secr/drafts/views.py b/ietf/secr/drafts/views.py index 44ffbcb9b..66d297642 100644 --- a/ietf/secr/drafts/views.py +++ b/ietf/secr/drafts/views.py @@ -190,13 +190,13 @@ def do_extend(draft, request): draft.save() DocEvent.objects.create(type='changed_document', - by=request.user.get_profile(), + by=request.user.person, doc=draft, time=draft.time, desc='extend_expiry') # save scheduled announcement - announcement_from_form(request.session['email'],by=request.user.get_profile()) + announcement_from_form(request.session['email'],by=request.user.person) return @@ -225,7 +225,7 @@ def do_replace(draft, request): archive_draft_files(replaced.document.name + '-' + replaced.document.rev) # send announcement - announcement_from_form(request.session['email'],by=request.user.get_profile()) + announcement_from_form(request.session['email'],by=request.user.person) return @@ -255,13 +255,13 @@ def do_resurrect(draft, request): # create DocEvent NewRevisionDocEvent.objects.create(type='completed_resurrect', - by=request.user.get_profile(), + by=request.user.person, doc=draft, rev=draft.rev, time=draft.time) # send announcement - announcement_from_form(request.session['email'],by=request.user.get_profile()) + announcement_from_form(request.session['email'],by=request.user.person) return @@ -303,7 +303,7 @@ def do_revision(draft, request): # create DocEvent NewRevisionDocEvent.objects.create(type='new_revision', - by=request.user.get_profile(), + by=request.user.person, doc=draft, rev=new_draft.rev, desc='New revision available', @@ -319,7 +319,7 @@ def do_revision(draft, request): # send announcement if we are in IESG process if new_draft.get_state('draft-iesg'): - announcement_from_form(request.session['email'],by=request.user.get_profile()) + announcement_from_form(request.session['email'],by=request.user.person) return @@ -353,7 +353,7 @@ def do_update(draft,request): # create DocEvent NewRevisionDocEvent.objects.create(type='new_revision', - by=request.user.get_profile(), + by=request.user.person, doc=new_draft, rev=new_draft.rev, desc='New revision available', @@ -366,7 +366,7 @@ def do_update(draft,request): post_submission(request) # send announcement - announcement_from_form(request.session['email'],by=request.user.get_profile()) + announcement_from_form(request.session['email'],by=request.user.person) return @@ -388,7 +388,7 @@ def do_withdraw(draft,request): # no DocEvent ? # send announcement - announcement_from_form(request.session['email'],by=request.user.get_profile()) + announcement_from_form(request.session['email'],by=request.user.person) return # ------------------------------------------------- @@ -577,7 +577,7 @@ def add(request): # create DocEvent NewRevisionDocEvent.objects.create(type='new_revision', - by=request.user.get_profile(), + by=request.user.person, doc=draft, rev=draft.rev, time=draft.time, @@ -621,7 +621,7 @@ def announce(request, id): email_form = EmailForm(get_email_initial(draft,type='new')) announcement_from_form(email_form.data, - by=request.user.get_profile(), + by=request.user.person, from_val='Internet-Drafts@ietf.org', content_type='Multipart/Mixed; Boundary="NextPart"') @@ -794,7 +794,7 @@ def edit(request, id): if form.changed_data: save_document_in_history(draft) DocEvent.objects.create(type='changed_document', - by=request.user.get_profile(), + by=request.user.person, doc=draft, desc='Changed field(s): %s' % ','.join(form.changed_data)) # see EditModelForm.save() for detailed logic @@ -929,7 +929,7 @@ def makerfc(request, id): # create DocEvent DocEvent.objects.create(type='published_rfc', - by=request.user.get_profile(), + by=request.user.person, doc=rfc) # change state diff --git a/ietf/secr/groups/views.py b/ietf/secr/groups/views.py index aa9b77c67..26f2cc084 100644 --- a/ietf/secr/groups/views.py +++ b/ietf/secr/groups/views.py @@ -115,7 +115,7 @@ def add(request): # always create started event ChangeStateGroupEvent.objects.create(group=group, type='changed_state', - by=request.user.get_profile(), + by=request.user.person, state=group.state, desc='Started group') @@ -249,7 +249,7 @@ def edit(request, acronym): desc = state.name + ' group' ChangeStateGroupEvent.objects.create(group=group, type='changed_state', - by=request.user.get_profile(), + by=request.user.person, state=state, desc=desc) form.changed_data.remove('state') @@ -258,7 +258,7 @@ def edit(request, acronym): if form.changed_data: GroupEvent.objects.create(group=group, type='info_changed', - by=request.user.get_profile(), + by=request.user.person, desc='Info Changed') # if the acronym was changed we'll want to redirect using the new acronym below diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index 90afa41b9..1fd1cb05e 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -165,7 +165,7 @@ def send_notification(request, sessions): ''' group = sessions[0].group to_email = sessions[0].requested_by.role_email('chair').address - cc_list = get_cc_list(group, request.user.get_profile()) + cc_list = get_cc_list(group, request.user.person) from_email = ('"IETF Secretariat"','agenda@ietf.org') if sessions.count() == 1: subject = '%s - Requested session has been scheduled for IETF %s' % (group.acronym, sessions[0].meeting.number) diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index e11f49e77..5483c7064 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -330,7 +330,7 @@ def delete_material(request,slide_id): # create deleted_document DocEvent.objects.create(doc=doc, - by=request.user.get_profile(), + by=request.user.person, type='deleted') create_proceedings(meeting,group) @@ -433,7 +433,7 @@ def interim(request, acronym): # create session to associate this meeting with a group and hold material Session.objects.create(meeting=meeting, group=group, - requested_by=request.user.get_profile(), + requested_by=request.user.person, status_id='sched') create_interim_directory() @@ -482,7 +482,7 @@ def main(request): ''' # getting numerous errors when people try to access using the wrong account try: - person = request.user.get_profile() + person = request.user.person except Person.DoesNotExist: return HttpResponseForbidden('ACCESS DENIED: user=%s' % request.META['REMOTE_USER']) @@ -623,7 +623,7 @@ def replace_slide(request, slide_id): # create DocEvent uploaded DocEvent.objects.create(doc=slide, - by=request.user.get_profile(), + by=request.user.person, type='uploaded') # rebuild proceedings.html @@ -659,7 +659,7 @@ def select(request, meeting_num): meeting = get_object_or_404(Meeting, number=meeting_num) user = request.user - person = user.get_profile() + person = user.person groups_session, groups_no_session = groups_by_session(user, meeting) proceedings_url = get_proceedings_url(meeting) @@ -850,7 +850,7 @@ def upload_unified(request, meeting_num, acronym=None, session_id=None): # create NewRevisionDocEvent instead of uploaded, per Ole NewRevisionDocEvent.objects.create(type='new_revision', - by=request.user.get_profile(), + by=request.user.person, doc=doc, rev=doc.rev, desc='New revision available', diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py index 13f5ff276..7ff24576e 100644 --- a/ietf/secr/sreq/views.py +++ b/ietf/secr/sreq/views.py @@ -179,7 +179,7 @@ def approve(request, acronym): group = get_object_or_404(Group, acronym=acronym) session = Session.objects.get(meeting=meeting,group=group,status='apprw') - if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.get_profile()): + if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.person): session.status = SessionStatusName.objects.get(slug='appr') session.save() @@ -204,7 +204,7 @@ def cancel(request, acronym): meeting = get_meeting() group = get_object_or_404(Group, acronym=acronym) sessions = Session.objects.filter(meeting=meeting,group=group).order_by('id') - login = request.user.get_profile() + login = request.user.person # delete conflicts Constraint.objects.filter(meeting=meeting,source=group).delete() @@ -241,7 +241,7 @@ def confirm(request, acronym): form = querydict.copy() meeting = get_meeting() group = get_object_or_404(Group,acronym=acronym) - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': # clear http session data @@ -313,7 +313,7 @@ def edit(request, acronym): sessions_count = sessions.count() initial = get_initial_session(sessions) session_conflicts = session_conflicts_as_string(group, meeting) - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': button_text = request.POST.get('submit', '') @@ -530,7 +530,7 @@ def no_session(request, acronym): ''' meeting = get_meeting() group = get_object_or_404(Group, acronym=acronym) - login = request.user.get_profile() + login = request.user.person # delete canceled record if there is one Session.objects.filter(group=group,meeting=meeting,status='canceled').delete() @@ -640,7 +640,7 @@ def view(request, acronym): # if sessions include a 3rd session waiting approval and the user is a secretariat or AD of the group # display approve button if sessions.filter(status='apprw'): - if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.get_profile()): + if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.person): show_approve_button = True # build session dictionary (like querydict from new session request form) for use in template diff --git a/ietf/secr/telechat/views.py b/ietf/secr/telechat/views.py index 898419105..40b4f1a16 100644 --- a/ietf/secr/telechat/views.py +++ b/ietf/secr/telechat/views.py @@ -166,7 +166,7 @@ def doc_detail(request, date, name): state_type = 'draft-iesg' started_process = doc.latest_event(type="started_iesg_process") - login = request.user.get_profile() + login = request.user.person if doc.active_ballot(): ballots = doc.active_ballot().active_ad_positions() # returns dict of ad:ballotpositiondocevent diff --git a/ietf/secr/utils/decorators.py b/ietf/secr/utils/decorators.py index 0cd7214ef..6f5d56240 100644 --- a/ietf/secr/utils/decorators.py +++ b/ietf/secr/utils/decorators.py @@ -52,7 +52,7 @@ def check_permissions(func): session = slide.session_set.all()[0] group = session.group - login = request.user.get_profile() + login = request.user.person all_roles = chain( group.role_set.filter(name__in=('chair','secr')), group.parent.role_set.filter(name__in=('ad','chair'))) @@ -82,7 +82,7 @@ def sec_only(func): return func(request, *args, **kwargs) return render_to_response('unauthorized.html',{ - 'user_name':request.user.get_profile()} + 'user_name':request.user.person} ) return wraps(func)(wrapper) diff --git a/ietf/secr/utils/group.py b/ietf/secr/utils/group.py index ed2771b17..520cdbfbf 100644 --- a/ietf/secr/utils/group.py +++ b/ietf/secr/utils/group.py @@ -47,7 +47,7 @@ def get_my_groups(user,conclude=False): if user == None: return all_groups else: - person = user.get_profile() + person = user.person if has_role(user,'Secretariat'): return all_groups diff --git a/ietf/settings.py b/ietf/settings.py index 37051f836..4fdc71e21 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -95,9 +95,8 @@ MEDIA_URL = 'http://www.ietf.org/' # Examples: "http://foo.com/media/", "/media/". ADMIN_MEDIA_PREFIX = '/media/' -DAJAXICE_MEDIA_PREFIX="dajaxice" +DAJAXICE_MEDIA_PREFIX = "dajaxice" -AUTH_PROFILE_MODULE = 'person.Person' AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.RemoteUserBackend', ) #DATABASE_ROUTERS = ["ietf.legacy_router.LegacyRouter"] diff --git a/ietf/submit/mail.py b/ietf/submit/mail.py index 42ddeff3f..75fe69014 100644 --- a/ietf/submit/mail.py +++ b/ietf/submit/mail.py @@ -88,7 +88,7 @@ def announce_to_lists(request, submission): m.by = Person.objects.get(name="(System)") if request.user.is_authenticated(): try: - m.by = request.user.get_profile() + m.by = request.user.person except Person.DoesNotExist: pass m.subject = 'I-D Action: %s-%s.txt' % (submission.name, submission.rev) diff --git a/ietf/submit/views.py b/ietf/submit/views.py index 7699a35f1..adbbf5882 100644 --- a/ietf/submit/views.py +++ b/ietf/submit/views.py @@ -415,7 +415,7 @@ def add_preapproval(request): if form.is_valid(): p = Preapproval() p.name = form.cleaned_data["name"] - p.by = request.user.get_profile() + p.by = request.user.person p.save() return HttpResponseRedirect(urlreverse("submit_approvals") + "#preapprovals") diff --git a/ietf/templates/base/left_menu.html b/ietf/templates/base/left_menu.html index 32edbdd29..f9b1886b4 100644 --- a/ietf/templates/base/left_menu.html +++ b/ietf/templates/base/left_menu.html @@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  • Options
    • {% if user|has_role:"Area Director" %}
  • AD Dashboard
    • -
  • My Documents
    • +
  • My Documents
  • Next Telechat
  • Discusses
  • Milestones
    • diff --git a/ietf/wgcharter/mails.py b/ietf/wgcharter/mails.py index 0f983a017..f024193cc 100644 --- a/ietf/wgcharter/mails.py +++ b/ietf/wgcharter/mails.py @@ -55,7 +55,7 @@ def email_state_changed(request, doc, text): def generate_ballot_writeup(request, doc): e = WriteupDocEvent() e.type = "changed_ballot_writeup_text" - e.by = request.user.get_profile() + e.by = request.user.person e.doc = doc e.desc = u"Ballot writeup was generated" e.text = unicode(render_to_string("wgcharter/ballot_writeup.txt")) diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py index d8fce3b66..71aa7aa83 100644 --- a/ietf/wgcharter/views.py +++ b/ietf/wgcharter/views.py @@ -54,7 +54,7 @@ def change_state(request, name, option=None): if charter.get_state_slug() != "infrev" or (initial_review and initial_review.expires < datetime.datetime.now()) or chartering_type == "rechartering": initial_review = None - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = ChangeStateForm(request.POST) @@ -216,7 +216,7 @@ class TelechatForm(forms.Form): @role_required("Area Director", "Secretariat") def telechat_date(request, name): doc = get_object_or_404(Document, type="charter", name=name) - login = request.user.get_profile() + login = request.user.person e = doc.latest_event(TelechatDocEvent, type="scheduled_for_telechat") @@ -248,7 +248,7 @@ class NotifyForm(forms.Form): @role_required("Area Director", "Secretariat") def edit_notify(request, name): doc = get_object_or_404(Document, type="charter", name=name) - login = request.user.get_profile() + login = request.user.person init = {'notify': doc.notify} @@ -299,7 +299,7 @@ def edit_ad(request, name): """Change the responsible Area Director for this charter.""" charter = get_object_or_404(Document, type="charter", name=name) - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = AdForm(request.POST) @@ -357,7 +357,7 @@ def submit(request, name=None, acronym=None, option=None): charter = get_object_or_404(Document, type="charter", name=name) group = charter.group - login = request.user.get_profile() + login = request.user.person path = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev)) not_uploaded_yet = charter.rev.endswith("-00") and not os.path.exists(path) @@ -433,7 +433,7 @@ def announcement_text(request, name, ann): charter = get_object_or_404(Document, type="charter", name=name) group = charter.group - login = request.user.get_profile() + login = request.user.person if ann in ("action", "review"): existing = charter.latest_event(WriteupDocEvent, type="changed_%s_announcement" % ann) @@ -504,7 +504,7 @@ def ballot_writeupnotes(request, name): if not ballot: raise Http404() - login = request.user.get_profile() + login = request.user.person approval = charter.latest_event(WriteupDocEvent, type="changed_action_announcement") @@ -568,7 +568,7 @@ def approve(request, name): charter = get_object_or_404(Document, type="charter", name=name) group = charter.group - login = request.user.get_profile() + login = request.user.person e = charter.latest_event(WriteupDocEvent, type="changed_action_announcement") if not e: diff --git a/ietf/wginfo/edit.py b/ietf/wginfo/edit.py index 4201df1f7..8bdddd812 100644 --- a/ietf/wginfo/edit.py +++ b/ietf/wginfo/edit.py @@ -162,7 +162,7 @@ def edit(request, acronym=None, action="edit"): else: raise Http404 - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = WGForm(request.POST, wg=wg, confirmed=request.POST.get("confirmed", False)) @@ -312,7 +312,7 @@ def conclude(request, acronym): """Request the closing of a WG, prompting for instructions.""" wg = get_object_or_404(Group, acronym=acronym) - login = request.user.get_profile() + login = request.user.person if request.method == 'POST': form = ConcludeForm(request.POST) diff --git a/ietf/wginfo/milestones.py b/ietf/wginfo/milestones.py index d63722c15..76108f954 100644 --- a/ietf/wginfo/milestones.py +++ b/ietf/wginfo/milestones.py @@ -118,7 +118,7 @@ def edit_milestones(request, acronym, milestone_set="current"): # # For charters we store the history on the charter document to not confuse people. - login = request.user.get_profile() + login = request.user.person group = get_object_or_404(Group, acronym=acronym) @@ -337,7 +337,7 @@ def edit_milestones(request, acronym, milestone_set="current"): @role_required('WG Chair', 'Area Director', 'Secretariat') def reset_charter_milestones(request, acronym): """Reset charter milestones to the currently in-use milestones.""" - login = request.user.get_profile() + login = request.user.person group = get_object_or_404(Group, acronym=acronym)