From e19290e98dedfceb42db6a629d01035cd68fb13a Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Tue, 6 Jun 2017 07:54:03 +0000
Subject: [PATCH] Merged in [13532] from rjsparks@nostrum.com:

    Add an expertise field to reviewer settings. Fixes #2308. ,
 - Legacy-Id: 13539
Note: SVN reference [13532] has been migrated to Git commit d845fba8bec765f2f81ae1a4bbca52c9bceb6e02
---
 ietf/group/tests_review.py                    |  4 +++-
 ietf/group/views_review.py                    |  2 +-
 .../0012_reviewersettings_expertise.py        | 20 +++++++++++++++++++
 ietf/review/models.py                         |  1 +
 ietf/templates/group/reviewer_overview.html   |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 ietf/review/migrations/0012_reviewersettings_expertise.py

diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index 9c7814f18..799bc270d 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -374,7 +374,8 @@ class ReviewTests(TestCase):
             "action": "change_settings",
             "min_interval": "7",
             "filter_re": "test-[regexp]",
-            "remind_days_before_deadline": "6"
+            "remind_days_before_deadline": "6",
+            "expertise": "Some expertise",
         })
         self.assertEqual(r.status_code, 302)
         settings = ReviewerSettings.objects.get(person=reviewer, team=review_req.team)
@@ -382,6 +383,7 @@ class ReviewTests(TestCase):
         self.assertEqual(settings.filter_re, "test-[regexp]")
         self.assertEqual(settings.skip_next, 0)
         self.assertEqual(settings.remind_days_before_deadline, 6)
+        self.assertEqual(settings.expertise, "Some expertise")
         self.assertEqual(len(outbox), 1)
         self.assertTrue("reviewer availability" in outbox[0]["subject"].lower())
         msg_content = outbox[0].get_payload(decode=True).decode("utf-8").lower()
diff --git a/ietf/group/views_review.py b/ietf/group/views_review.py
index 7599d7ccc..6030b4bcd 100644
--- a/ietf/group/views_review.py
+++ b/ietf/group/views_review.py
@@ -446,7 +446,7 @@ def email_open_review_assignments(request, acronym, group_type=None):
 class ReviewerSettingsForm(forms.ModelForm):
     class Meta:
         model = ReviewerSettings
-        fields = ['min_interval', 'filter_re', 'skip_next', 'remind_days_before_deadline']
+        fields = ['min_interval', 'filter_re', 'skip_next', 'remind_days_before_deadline','expertise']
 
     def __init__(self, *args, **kwargs):
        exclude_fields = kwargs.pop('exclude_fields', [])
diff --git a/ietf/review/migrations/0012_reviewersettings_expertise.py b/ietf/review/migrations/0012_reviewersettings_expertise.py
new file mode 100644
index 000000000..342266af7
--- /dev/null
+++ b/ietf/review/migrations/0012_reviewersettings_expertise.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-06-06 00:29
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('review', '0011_add_review_doc_authors'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='reviewersettings',
+            name='expertise',
+            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"),
+        ),
+    ]
diff --git a/ietf/review/models.py b/ietf/review/models.py
index d4c967306..c5a32e5c7 100644
--- a/ietf/review/models.py
+++ b/ietf/review/models.py
@@ -25,6 +25,7 @@ class ReviewerSettings(models.Model):
         help_text="Draft names matching this regular expression should not be assigned")
     skip_next   = models.IntegerField(default=0, verbose_name="Skip next assignments")
     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.")
+    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='')
 
     def __unicode__(self):
         return u"{} in {}".format(self.person, self.team)
diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html
index 26a21ac9c..8f6f90006 100644
--- a/ietf/templates/group/reviewer_overview.html
+++ b/ietf/templates/group/reviewer_overview.html
@@ -39,7 +39,7 @@
               {% elif person.busy %}class="busy"
               {% elif person.settings.skip_next %}class="skip-next"
               {% endif %}>
-            <td>{% if person.settings_url %}<a href="{{ person.settings_url }}">{% endif %}{{ person }}{% if person.settings_url %}</a>{% endif %}</td>
+            <td>{% if person.settings_url %}<a href="{{ person.settings_url }}" title="{{person.settings.expertise}}">{% endif %}{{ person }}{% if person.settings_url %}</a>{% endif %}</td>
             <td>
               <table class="simple-table">
                 {% for req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %}