Skip to content

Commit e19290e

Browse files
committed
Merged in [13532] from rjsparks@nostrum.com:
Add an expertise field to reviewer settings. Fixes ietf-tools#2308. , - Legacy-Id: 13539 Note: SVN reference [13532] has been migrated to Git commit d845fba
1 parent fb93a8c commit e19290e

5 files changed

Lines changed: 26 additions & 3 deletions

File tree

ietf/group/tests_review.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,14 +374,16 @@ def test_change_reviewer_settings(self):
374374
"action": "change_settings",
375375
"min_interval": "7",
376376
"filter_re": "test-[regexp]",
377-
"remind_days_before_deadline": "6"
377+
"remind_days_before_deadline": "6",
378+
"expertise": "Some expertise",
378379
})
379380
self.assertEqual(r.status_code, 302)
380381
settings = ReviewerSettings.objects.get(person=reviewer, team=review_req.team)
381382
self.assertEqual(settings.min_interval, 7)
382383
self.assertEqual(settings.filter_re, "test-[regexp]")
383384
self.assertEqual(settings.skip_next, 0)
384385
self.assertEqual(settings.remind_days_before_deadline, 6)
386+
self.assertEqual(settings.expertise, "Some expertise")
385387
self.assertEqual(len(outbox), 1)
386388
self.assertTrue("reviewer availability" in outbox[0]["subject"].lower())
387389
msg_content = outbox[0].get_payload(decode=True).decode("utf-8").lower()

ietf/group/views_review.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ def email_open_review_assignments(request, acronym, group_type=None):
446446
class ReviewerSettingsForm(forms.ModelForm):
447447
class Meta:
448448
model = ReviewerSettings
449-
fields = ['min_interval', 'filter_re', 'skip_next', 'remind_days_before_deadline']
449+
fields = ['min_interval', 'filter_re', 'skip_next', 'remind_days_before_deadline','expertise']
450450

451451
def __init__(self, *args, **kwargs):
452452
exclude_fields = kwargs.pop('exclude_fields', [])
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.10.7 on 2017-06-06 00:29
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('review', '0011_add_review_doc_authors'),
12+
]
13+
14+
operations = [
15+
migrations.AddField(
16+
model_name='reviewersettings',
17+
name='expertise',
18+
field=models.TextField(blank=True, default=b'', help_text=b"Describe the reviewer's expertise in this team's area", max_length=2048, verbose_name=b"Reviewer's expertise in this team's area"),
19+
),
20+
]

ietf/review/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ReviewerSettings(models.Model):
2525
help_text="Draft names matching this regular expression should not be assigned")
2626
skip_next = models.IntegerField(default=0, verbose_name="Skip next assignments")
2727
remind_days_before_deadline = models.IntegerField(null=True, blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.")
28+
expertise = models.TextField(verbose_name="Reviewer's expertise in this team's area", max_length=2048, blank=True, help_text="Describe the reviewer's expertise in this team's area", default='')
2829

2930
def __unicode__(self):
3031
return u"{} in {}".format(self.person, self.team)

ietf/templates/group/reviewer_overview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h2>Reviewers</h2>
3939
{% elif person.busy %}class="busy"
4040
{% elif person.settings.skip_next %}class="skip-next"
4141
{% endif %}>
42-
<td>{% if person.settings_url %}<a href="{{ person.settings_url }}">{% endif %}{{ person }}{% if person.settings_url %}</a>{% endif %}</td>
42+
<td>{% if person.settings_url %}<a href="{{ person.settings_url }}" title="{{person.settings.expertise}}">{% endif %}{{ person }}{% if person.settings_url %}</a>{% endif %}</td>
4343
<td>
4444
<table class="simple-table">
4545
{% for req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %}

0 commit comments

Comments
 (0)