* chore: Remove unused "rendertest" stuff (#6015) * fix: restore ability to create status change documents (#5963) * fix: restore ability to create status change documents Fixes #5962 * chore: address review comment * fix: Provide human-friendly status in submission status API response (#6011) Co-authored-by: nectostr <bastinda96@gmail.com> * fix: Make name/email lookups case-insensitive (#5972) (#6007) * fix: Make name/email lookups case-insensitive (#5972) Use icontains so that looking up name or email is case insensitive Added a test Fixes: 5972 * fix: Use __iexact not __icontains * fix: Clarify no-action-needed (#5918) (#6020) When a draft is submitted for manual processing, clarify that no action is needed; the Secretariat has the next steps. Fixes: #5918 * fix: Fix menu hover issue (#6019) * fix: Fix menu hover issue Fixes #5702 * Fix leftmenu hover issue * fix: Server error from api_get_session_materials() (#6025) Fixes #5877 * fix: Clarify Questionnaire label (#4688) (#6017) When filtering nominees, `Questionnaire` implies `Accepted == yes` so fix the dropdown test tosay that. Fixes: #4688 * chore: Merge from @martinthomson's rfc-txt-html (#6023) * fix:no history entry when changing RFC Editor note for doc (#6021) * fix:no history entry when changing RFC Editor note for doc * fix:no history entry when changing RFC Editor note for doc --------- Co-authored-by: Priyanka Narkar <priyankanarkar@dhcp-91f8.meeting.ietf.org> * fix: avoid deprecation warning on view_list() for objs without CommunityList Fixes #5942 * fix: return 404 for non-existing revisions (#6014) * fix: return 404 for non-existing revisions Links to non-existing revisions to docs should return 404 * fix: change rfc/rev and search behaviour * refactor: fix tab level * fix: return 404 for rfc revision for bibtex * fix: provide date for revisions in bibtex output (#6029) * fix: provide date for revisions in bibtex output * refactor: change walrus to if's * fix: specify particular revision for events * fix: review refactoring issue fixes #5447 * fix: Remove automatically suggested document for document that is already has review request (fixes #3211) (#5425) * Added check that if there is already review request for the document in question, ignore the automatic suggestion for that document. Fixes #3211. * fix: dont block on open requests for a previous version. Add tests --------- Co-authored-by: Nicolas Giard <github@ngpixel.com> Co-authored-by: Robert Sparks <rjsparks@nostrum.com> * feat: IAB statements (#5940) * feat: support iab and iesg statements. Import iab statements. (#5895) * feat: infrastructure for statements doctype * chore: basic test framework * feat: basic statement document view * feat: show replaced statements * chore: black * fix: state help for statements * fix: cleanout non-relevant email expansions * feat: import iab statements, provide group statements tab * fix: guard against running import twice * feat: build redirect csv for iab statements * fix: set document state on import * feat: show published date on main doc view * feat: handle pdf statements * feat: create new and update statements * chore: copyright block updates * chore: remove flakes * chore: black * feat: add edit/new buttons for the secretariat * fix: address PR #5895 review comments * fix: pin pydantic until inflect catches up (#5901) (#5902) * chore: re-un-pin pydantic * feat: include submitter in email about submitted slides (#6033) * feat: include submitter in email about submitted slides fixes #6031 * chore: remove unintended whitespace change * chore(dev): update .vscode/settings.json with new taskExplorer settings * fix: Add editorial stream to proceedings (#6027) * fix: Add editorial stream to proceedings Fixes #5717 * fix: Move editorial stream after the irtf in proceedings * fix: Add editorial stream to meeting materials (#6047) Fixes #6042 * fix: Shows requested reviews for doc fixes (#6022) * Fix: Shows requested reviews for doc * Changed template includes to only give required variables to them. * feat: allow openId to choose an unactive email if there are none active (#6041) * feat: allow openId to choose an unactive email if there are no active ones * chore: correct typo * chore: rename unactive to inactive * fix: Make review table more responsive (#6053) * fix: Improve layout of review table * Progress * Progress * Final changes * Fix tests * Remove fluff * Undo commits * ci: add --validate-html-harder to tests * ci: add --validate-html-harder to build.yml workflow * fix: Set colspan to actual number of columns (#6069) * fix: Clean up view_feedback_pending (#6070) - Remove "Unclassified" column header, which caused misalignment in the table body. - Show the message author - previously displayed as `(None)`. * docs: Update LICENSE year * fix: Remove IESG state edit button when state is 'dead' (#6051) (#6065) * fix: Correctly order "last call requested" column in the IESG dashboard (#6079) * ci: update dev sandbox init script to start memcached * feat: Reclassify nomcom feedback (#6002) * fix: Clean up view_feedback_pending - Remove "Unclassified" column header, which caused misalignment in the table body. - Show the message author - previously displayed as `(None)`. * feat: Reclassify nomcom feedback (#4669) - There's a new `Chair/Advisor Tasks` menu item `Reclassify feedback`. - I overloaded `view_feedback*` URLs with a `?reclassify` parameter. - This adds a checkbox to each feedback message, and a `Reclassify` button at the bottom of each feedback page. - "Reclassifying" basically de-classifies the feedback, and punts it back to the "Pending emails" view for reclassification. - If a feedback has been applied to multiple nominees, declassifying it from one nominee removes it from all. * fix: Remove unused local variables * fix: Fix some missing and mis-nested html * test: Add tests for reclassifying feedback * refactor: Substantial redesign of feedback reclassification - Break out reclassify_feedback* as their own URLs and views, and revert changes to view_feedback*.html. - Replace checkboxes with a Reclassify button on each message. * fix: Remember to clear the feedback associations when reclassifying * feat: Add an 'Overcome by events' feedback type * refactor: When invoking reclassification from a view-feedback page, load the corresponding reclassify-feedback page * fix: De-conflict migration with 0004_statements Also change the coding style to match, and add a reverse migration. * fix: Fix a test case to account for new feedback type * fix: 842e730 broke the Back button * refactor: Reclassify feedback directly instead of putting it back in the work queue * fix: Adjust tests to new workflow * refactor: Further refine reclassification to avoid redirects * refactor: Impose a FeedbackTypeName ordering Also add FeedbackTypeName.legend field, rather than synthesizing it every time we classify or reclassify feedback. In the reclassification forms, only show the relevant feedback types. * refactor: Merge reclassify_feedback_* back into view_feedback_* This means the "Reclassify" button is always present, but eliminates some complexity. * refactor: Add filter(used=True) on FeedbackTypeName querysets * refactor: Add the new FeedbackTypeName to the reclassification success message * fix: Secure reclassification against rogue nomcom members * fix: Print decoded key and fully clean up test nomcom (#6094) * fix: Delete Person records when deleting a test nomcom * fix: Decode test nomcom private key before printing * test: Use correct time zone for test_statement_doc_view (#6064) * chore(deps): update all npm dependencies for playwright (#6061) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> * chore(deps): update all npm dependencies for dev/diff (#6062) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> * chore(deps): update all npm dependencies for dev/coverage-action (#6063) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> * fix: Hash cache key for default memcached cache (#6089) * feat: Show docs that an AD hasn't balloted on that need ballots to progress (#6075) * fix(doc): Unify help texts for document states (#6060) * Fix IESG State help text link (only) * Intermediate checkpoint * Correct URL filtering of state descriptions * Unify help texts for document states * Remove redundant load static from template --------- Co-authored-by: Robert Sparks <rjsparks@nostrum.com> * ci: fix sandbox start.sh memcached user * fix: refactor how settings handles cache definitions (#6099) * fix: refactor how settings handles cache definitions * chore: more english-speaker readable expression * fix: Cast cache key to str before calling encode (#6100) --------- Co-authored-by: Robert Sparks <rjsparks@nostrum.com> Co-authored-by: Liubov Kurafeeva <liubov.kurafeeva@gmail.com> Co-authored-by: nectostr <bastinda96@gmail.com> Co-authored-by: Rich Salz <rsalz@akamai.com> Co-authored-by: PriyankaN <priyanka@amsl.com> Co-authored-by: Priyanka Narkar <priyankanarkar@dhcp-91f8.meeting.ietf.org> Co-authored-by: Ali <alireza83@gmail.com> Co-authored-by: Roman Beltiukov <maybe.hello.world@gmail.com> Co-authored-by: Tero Kivinen <kivinen@iki.fi> Co-authored-by: Nicolas Giard <github@ngpixel.com> Co-authored-by: Kesara Rathnayake <kesara@fq.nz> Co-authored-by: Jennifer Richards <jennifer@staff.ietf.org> Co-authored-by: Paul Selkirk <paul@painless-security.com> Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Jim Fenton <fenton@bluepopcorn.net>
162 lines
5.6 KiB
Python
162 lines
5.6 KiB
Python
# Copyright The IETF Trust 2012-2020, All Rights Reserved
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
from io import StringIO, BytesIO
|
|
from PIL import Image
|
|
|
|
from django.contrib import messages
|
|
from django.db.models import Q
|
|
from django.http import HttpResponse, Http404
|
|
from django.shortcuts import render, get_object_or_404, redirect
|
|
from django.utils import timezone
|
|
|
|
import debug # pyflakes:ignore
|
|
|
|
from ietf.ietfauth.utils import role_required
|
|
from ietf.person.models import Email, Person, Alias
|
|
from ietf.person.fields import select2_id_name_json
|
|
from ietf.person.forms import MergeForm
|
|
from ietf.person.utils import handle_users, merge_persons
|
|
|
|
|
|
def ajax_select2_search(request, model_name):
|
|
if model_name == "email":
|
|
model = Email
|
|
else:
|
|
model = Person
|
|
|
|
q = [w.strip() for w in request.GET.get('q', '').split() if w.strip()]
|
|
|
|
if not q:
|
|
objs = model.objects.none()
|
|
else:
|
|
query = Q() # all objects returned if no other terms in the queryset
|
|
for t in q:
|
|
if model == Email:
|
|
query &= Q(person__alias__name__icontains=t) | Q(address__icontains=t)
|
|
elif model == Person:
|
|
if "@" in t: # allow searching email address if there's a @ in the search term
|
|
query &= Q(alias__name__icontains=t) | Q(email__address__icontains=t)
|
|
else:
|
|
query &= Q(alias__name__icontains=t)
|
|
|
|
objs = model.objects.filter(query)
|
|
|
|
# require an account at the Datatracker
|
|
only_users = request.GET.get("user") == "1"
|
|
all_emails = request.GET.get("a", "0") == "1"
|
|
|
|
if model == Email:
|
|
objs = objs.exclude(person=None).order_by('person__name')
|
|
if not all_emails:
|
|
objs = objs.filter(active=True)
|
|
if only_users:
|
|
objs = objs.exclude(person__user=None)
|
|
elif model == Person:
|
|
objs = objs.order_by("name")
|
|
if only_users:
|
|
objs = objs.exclude(user=None)
|
|
|
|
try:
|
|
page = int(request.GET.get("p", 1)) - 1
|
|
except ValueError:
|
|
page = 0
|
|
|
|
objs = objs.distinct()[page:page + 10]
|
|
|
|
return HttpResponse(select2_id_name_json(objs), content_type='application/json')
|
|
|
|
|
|
def profile(request, email_or_name):
|
|
aliases = Alias.objects.filter(name__iexact=email_or_name)
|
|
persons = set(a.person for a in aliases)
|
|
|
|
if '@' in email_or_name:
|
|
emails = Email.objects.filter(address__iexact=email_or_name)
|
|
persons.update(e.person for e in emails)
|
|
|
|
persons = [p for p in persons if p and p.id]
|
|
if not persons:
|
|
raise Http404
|
|
persons.sort(key=lambda p: p.id)
|
|
return render(request, 'person/profile.html', {'persons': persons, 'today': timezone.now()})
|
|
|
|
|
|
def photo(request, email_or_name):
|
|
if '@' in email_or_name:
|
|
persons = [ get_object_or_404(Email, address=email_or_name).person, ]
|
|
else:
|
|
aliases = Alias.objects.filter(name=email_or_name)
|
|
persons = list(set([ a.person for a in aliases ]))
|
|
if not persons:
|
|
raise Http404("No such person")
|
|
if len(persons) > 1:
|
|
return HttpResponse(r"\r\n".join([p.email() for p in persons]), status=300)
|
|
person = persons[0]
|
|
if not person.photo:
|
|
raise Http404("No photo found")
|
|
size = request.GET.get('s') or request.GET.get('size', '80')
|
|
if not size.isdigit():
|
|
return HttpResponse("Size must be integer", status=400)
|
|
size = int(size)
|
|
with Image.open(person.photo) as img:
|
|
img = img.resize((size, img.height*size//img.width))
|
|
bytes = BytesIO()
|
|
try:
|
|
img.save(bytes, format='JPEG')
|
|
return HttpResponse(bytes.getvalue(), content_type='image/jpg')
|
|
except OSError:
|
|
raise Http404
|
|
|
|
|
|
@role_required("Secretariat")
|
|
def merge(request):
|
|
form = MergeForm()
|
|
method = 'get'
|
|
change_details = ''
|
|
warn_messages = []
|
|
source = None
|
|
target = None
|
|
|
|
if request.method == "GET":
|
|
form = MergeForm()
|
|
if request.GET:
|
|
form = MergeForm(request.GET)
|
|
if form.is_valid():
|
|
source = form.cleaned_data.get('source')
|
|
target = form.cleaned_data.get('target')
|
|
if source.user and target.user:
|
|
warn_messages.append('WARNING: Both Person records have logins. Be sure to specify the record to keep in the Target field.')
|
|
if source.user.last_login and target.user.last_login and source.user.last_login > target.user.last_login:
|
|
warn_messages.append('WARNING: The most recently used login is being deleted!')
|
|
change_details = handle_users(source, target, check_only=True)
|
|
method = 'post'
|
|
else:
|
|
method = 'get'
|
|
|
|
if request.method == "POST":
|
|
form = MergeForm(request.POST)
|
|
if form.is_valid():
|
|
source = form.cleaned_data.get('source')
|
|
source_id = source.id
|
|
target = form.cleaned_data.get('target')
|
|
# Do merge with force
|
|
output = StringIO()
|
|
success, changes = merge_persons(request, source, target, file=output)
|
|
if success:
|
|
messages.success(request, 'Merged {} ({}) to {} ({}). {})'.format(
|
|
source.name, source_id, target.name, target.id, changes))
|
|
else:
|
|
messages.error(request, output)
|
|
return redirect('ietf.secr.rolodex.views.view', id=target.pk)
|
|
|
|
return render(request, 'person/merge.html', {
|
|
'form': form,
|
|
'method': method,
|
|
'change_details': change_details,
|
|
'source': source,
|
|
'target': target,
|
|
'warn_messages': warn_messages,
|
|
})
|