Skip to content

fix: Add link to public pages to private NomCom pages #6345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 7 commits into from
Sep 29, 2023
Merged

fix: Add link to public pages to private NomCom pages #6345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9391985
fix: Add link to public pages to private NomCom pages
larseggert Sep 21, 2023
e762011
Fix pyflake
larseggert Sep 21, 2023
26f34f4
Merge branch 'main' into fix-6343
larseggert Sep 22, 2023
d0de229
Merge remote-tracking branch 'origin/main' into fix-6343
larseggert Sep 25, 2023
9efcce2
Be less clever
larseggert Sep 25, 2023
a42ef58
Unsplit conditionals
larseggert Sep 25, 2023
8f0a0da
fix: Typo
jennifer-richards Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ietf/nomcom/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
url(r'^(?P<year>\d{4})/private/view-feedback/nominee/(?P<nominee_id>\d+)$', views.view_feedback_nominee),
url(r'^(?P<year>\d{4})/private/view-feedback/topic/(?P<topic_id>\d+)$', views.view_feedback_topic),
url(r'^(?P<year>\d{4})/private/edit/nominee/(?P<nominee_id>\d+)$', views.edit_nominee),
url(r'^(?P<year>\d{4})/private/merge-nominee/?$', views.private_merge_nominee),
url(r'^(?P<year>\d{4})/private/merge-person/?$', views.private_merge_person),
url(r'^(?P<year>\d{4})/private/merge-nominee/$', views.private_merge_nominee),
url(r'^(?P<year>\d{4})/private/merge-person/$', views.private_merge_person),
url(r'^(?P<year>\d{4})/private/send-reminder-mail/(?P<type>\w+)/$', views.send_reminder_mail),
url(r'^(?P<year>\d{4})/private/extract-email-lists/$', views.extract_email_lists),
url(r'^(?P<year>\d{4})/private/edit-members/$', views.edit_members),
Expand Down
51 changes: 10 additions & 41 deletions ietf/nomcom/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ def year_index(request, year):
return render(request, 'nomcom/year_index.html',
{'nomcom': nomcom,
'year': year,
'selected': 'index',
'template': template})

def announcements(request):
Expand Down Expand Up @@ -182,8 +181,7 @@ def private_key(request, year):
{'nomcom': nomcom,
'year': year,
'back_url': back_url,
'form': form,
'selected': 'private_key'})
'form': form})


@role_required("Nomcom")
Expand Down Expand Up @@ -280,7 +278,6 @@ def private_index(request, year):
'positions': positions,
'selected_state': selected_state,
'selected_position': selected_position and int(selected_position) or None,
'selected': 'index',
'is_chair': is_chair,
'mailto': mailto,
})
Expand All @@ -305,13 +302,11 @@ def send_reminder_mail(request, year, type):
interesting_state = 'pending'
mail_path = nomcom_template_path + NOMINEE_ACCEPT_REMINDER_TEMPLATE
reminder_description = 'accept (or decline) a nomination'
selected_tab = 'send_accept_reminder'
state_description = NomineePositionStateName.objects.get(slug=interesting_state).name
elif type=='questionnaire':
interesting_state = 'accepted'
mail_path = nomcom_template_path + NOMINEE_QUESTIONNAIRE_REMINDER_TEMPLATE
reminder_description = 'complete the questionnaire for a nominated position'
selected_tab = 'send_questionnaire_reminder'
state_description = NomineePositionStateName.objects.get(slug=interesting_state).name+' but no questionnaire has been received'
else:
raise Http404
Expand Down Expand Up @@ -346,7 +341,6 @@ def send_reminder_mail(request, year, type):
'year': year,
'nominees': annotated_nominees,
'mail_template': mail_template,
'selected': selected_tab,
'reminder_description': reminder_description,
'state_description': state_description,
'is_chair_task' : True,
Expand All @@ -373,7 +367,6 @@ def private_merge_person(request, year):
{'nomcom': nomcom,
'year': year,
'form': form,
'selected': 'merge_person',
'is_chair_task' : True,
})

Expand All @@ -398,7 +391,6 @@ def private_merge_nominee(request, year):
{'nomcom': nomcom,
'year': year,
'form': form,
'selected': 'merge_nominee',
'is_chair_task' : True,
})

Expand All @@ -408,8 +400,7 @@ def requirements(request, year):
return render(request, 'nomcom/requirements.html',
{'nomcom': nomcom,
'positions': positions,
'year': year,
'selected': 'requirements'})
'year': year})


def questionnaires(request, year):
Expand All @@ -418,8 +409,7 @@ def questionnaires(request, year):
return render(request, 'nomcom/questionnaires.html',
{'nomcom': nomcom,
'positions': positions,
'year': year,
'selected': 'questionnaires'})
'year': year})


@login_required
Expand Down Expand Up @@ -453,15 +443,13 @@ def nominate(request, year, public, newperson):
messages.warning(request, "This Nomcom is not yet accepting nominations")
return render(request, template,
{'nomcom': nomcom,
'year': year,
'selected': 'nominate'})
'year': year})

if nomcom.group.state_id == 'conclude':
messages.warning(request, "Nominations to this Nomcom are closed.")
return render(request, template,
{'nomcom': nomcom,
'year': year,
'selected': 'nominate'})
'year': year})

if request.method == 'POST':
if newperson:
Expand All @@ -485,8 +473,7 @@ def nominate(request, year, public, newperson):
{'form': form,
'nomcom': nomcom,
'year': year,
'positions': nomcom.position_set.filter(is_open=True),
'selected': 'nominate'})
'positions': nomcom.position_set.filter(is_open=True)})

@login_required
def public_feedback(request, year):
Expand Down Expand Up @@ -550,7 +537,6 @@ def feedback(request, year, public):
return render(request, 'nomcom/feedback.html', {
'nomcom': nomcom,
'year': year,
'selected': 'feedback',
'counts' : counts,
'base_template': base_template
})
Expand All @@ -561,7 +547,6 @@ def feedback(request, year, public):
'form': None,
'nomcom': nomcom,
'year': year,
'selected': 'feedback',
'positions': positions,
'topics': topics,
'counts' : counts,
Expand All @@ -575,7 +560,6 @@ def feedback(request, year, public):
'form': None,
'nomcom': nomcom,
'year': year,
'selected': 'feedback',
'positions': positions,
'topics': topics,
'counts' : counts,
Expand Down Expand Up @@ -622,7 +606,6 @@ def feedback(request, year, public):
'year': year,
'positions': positions,
'topics': topics,
'selected': 'feedback',
'counts': counts,
'topic_counts': topic_counts,
'base_template': base_template
Expand All @@ -648,7 +631,6 @@ def private_feedback_email(request, year):
return render(request, template,
{'nomcom': nomcom,
'year': year,
'selected': 'feedback_email',
'is_chair_task' : True,
})

Expand All @@ -668,8 +650,7 @@ def private_feedback_email(request, year):
return render(request, template,
{'form': form,
'nomcom': nomcom,
'year': year,
'selected': 'feedback_email'})
'year': year})

@role_required("Nomcom Chair", "Nomcom Advisor")
def private_questionnaire(request, year):
Expand All @@ -691,7 +672,6 @@ def private_questionnaire(request, year):
return render(request, template,
{'nomcom': nomcom,
'year': year,
'selected': 'questionnaire',
'is_chair_task' : True,
})

Expand All @@ -710,8 +690,7 @@ def private_questionnaire(request, year):
{'form': form,
'questionnaire_response': questionnaire_response,
'nomcom': nomcom,
'year': year,
'selected': 'questionnaire'})
'year': year})


def process_nomination_status(request, year, nominee_position_id, state, date, hash):
Expand Down Expand Up @@ -765,7 +744,6 @@ def process_nomination_status(request, year, nominee_position_id, state, date, h
'nominee_position': nominee_position,
'state': state,
'need_confirmation': need_confirmation,
'selected': 'feedback',
'form': form })

@role_required("Nomcom")
Expand Down Expand Up @@ -830,7 +808,6 @@ def nominee_staterank(nominee):

return render(request, 'nomcom/view_feedback.html',
{'year': year,
'selected': 'view_feedback',
'nominees': nominees,
'nominee_feedback_types': nominee_feedback_types,
'independent_feedback_types': independent_feedback_types,
Expand Down Expand Up @@ -927,7 +904,6 @@ def view_feedback_pending(request, year):
form.set_nomcom(nomcom, request.user)
return render(request, 'nomcom/view_feedback_pending.html',
{'year': year,
'selected': 'feedback_pending',
'formset': formset,
'extra_step': extra_step,
'extra_ids': extra_ids,
Expand Down Expand Up @@ -1090,7 +1066,6 @@ def edit_nominee(request, year, nominee_id):

return render(request, 'nomcom/edit_nominee.html',
{'year': year,
'selected': 'index',
'nominee': nominee,
'form': form,
'nomcom': nomcom,
Expand Down Expand Up @@ -1128,7 +1103,6 @@ def edit_nomcom(request, year):
'formset': formset,
'nomcom': nomcom,
'year': year,
'selected': 'edit_nomcom',
'is_chair_task' : True,
})

Expand All @@ -1142,7 +1116,6 @@ def list_templates(request, year):
return render(request, 'nomcom/list_templates.html',
{'template_list': template_list,
'year': year,
'selected': 'edit_templates',
'nomcom': nomcom,
'is_chair_task' : True,
})
Expand Down Expand Up @@ -1215,7 +1188,6 @@ def list_positions(request, year):
return render(request, 'nomcom/list_positions.html',
{'positions': positions,
'year': year,
'selected': 'edit_positions',
'nomcom': nomcom,
'is_chair_task' : True,
})
Expand Down Expand Up @@ -1282,7 +1254,6 @@ def list_topics(request, year):
return render(request, 'nomcom/list_topics.html',
{'topics': topics,
'year': year,
'selected': 'edit_topics',
'nomcom': nomcom,
'is_chair_task' : True,
})
Expand Down Expand Up @@ -1364,8 +1335,7 @@ def edit_members(request, year):
return render(request, 'nomcom/new_edit_members.html',
{'nomcom' : nomcom,
'year' : year,
'form': form,
})
'form': form})

@role_required("Nomcom Chair", "Nomcom Advisor")
def extract_email_lists(request, year):
Expand All @@ -1385,8 +1355,7 @@ def extract_email_lists(request, year):
'pending': pending,
'accepted': accepted,
'noresp': noresp,
'bypos': bypos,
})
'bypos': bypos})

@login_required
def volunteer(request):
Expand Down
2 changes: 1 addition & 1 deletion ietf/static/js/ietf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ $(document)
var text = $(this)
.text();
// insert some <wbr> at strategic places
var newtext = text.replace(/([@._])/g, "$1<wbr>");
var newtext = text.replace(/([@._+])/g, "$1<wbr>");
if (newtext === text) {
return;
}
Expand Down
Loading