Undid previous merge

 - Legacy-Id: 16113

Author: levkowetz

bin/mergedevbranch

@@ -167,12 +167,6 @@ if [ "$REPLY" != "" ]; then
 fi
 
 echo ""
-
-note "Writing commit script"
-echo -e "#!/bin/bash\n\nsvn commit -m \"Merged in [$rev] from $who:\n    ${comment//\"/\'} ${fix//\"/\'}\"" > ../cicmd/commit-${rev}-merge.sh
-chmod +x ../cicmd/commit-${rev}-merge.sh
-
-
 read -p "Continue with the merge? [Y/n] "
 [ "$REPLY" = "Y" -o  "$REPLY" = "y" -o  "$REPLY" = "" ] || exit
 
@@ -185,6 +179,10 @@ else
   svn merge -c $rev ${repo}/$branch ."
 fi
 
+note "Writing commit script"
+echo -e "#!/bin/bash\n\nsvn commit -m \"Merged in [$rev] from $who:\n    ${comment//\"/\'} ${fix//\"/\'}\"" > ../cicmd/commit-${rev}-merge.sh
+chmod +x ../cicmd/commit-${rev}-merge.sh
+
 M=$(svn st | cut -c 1-7 | grep -oh 'M' | head -n 1)
 C=$(svn st | cut -c 1-7 | grep -oh 'C' | head -n 1)
 G=$(svn st | cut -c 1-7 | grep -oh 'G' | head -n 1)

ietf/group/forms.py

@@ -323,7 +323,6 @@ def clean_end_date(self):
 class ReviewSecretarySettingsForm(forms.ModelForm):
     class Meta:
         model = ReviewSecretarySettings
-        fields = ['remind_days_before_deadline', 'max_items_to_show_in_reviewer_list',
-                  'days_to_show_in_reviewer_list']
+        fields = ['remind_days_before_deadline']
 
 

ietf/group/tests_review.py

@@ -519,15 +519,11 @@ def test_change_review_secretary_settings(self):
 
         # set settings
         r = self.client.post(url, {
-            "remind_days_before_deadline": "6",
-            "max_items_to_show_in_reviewer_list": 10,
-            "days_to_show_in_reviewer_list": 365
+            "remind_days_before_deadline": "6"
         })
         self.assertEqual(r.status_code, 302)
         settings = ReviewSecretarySettings.objects.get(person=secretary, team=review_req.team)
         self.assertEqual(settings.remind_days_before_deadline, 6)
-        self.assertEqual(settings.max_items_to_show_in_reviewer_list, 10)
-        self.assertEqual(settings.days_to_show_in_reviewer_list, 365)
 
     def test_review_reminders(self):
         review_req = ReviewRequestFactory()

ietf/group/views.py

@@ -36,7 +36,6 @@
 
 import os
 import re
-import sys
 import json
 import math
 import itertools
@@ -1389,7 +1388,6 @@ def reviewer_overview(request, acronym, group_type=None):
 
 
         MAX_CLOSED_REQS = 10
-        days_since = sys.maxsize
         req_data = req_data_for_reviewers.get(person.pk, [])
         open_reqs = sum(1 for d in req_data if d.state in ["requested", "accepted"])
         latest_reqs = []
@@ -1398,17 +1396,7 @@ def reviewer_overview(request, acronym, group_type=None):
                 latest_reqs.append((d.req_pk, d.doc, d.reviewed_rev, d.assigned_time, d.deadline,
                                     review_state_by_slug.get(d.state),
                                     int(math.ceil(d.assignment_to_closure_days)) if d.assignment_to_closure_days is not None else None))
-            if d.state in ["completed", "completed_in_time", "completed_late"]:
-                if d.assigned_time is not None:
-                    delta = datetime.datetime.now() - d.assigned_time
-                    if d.assignment_to_closure_days is not None:
-                        days = int(delta.days - d.assignment_to_closure_days)
-                        if days_since > days: days_since = days
-
-        if days_since == sys.maxsize:
-            days_since = None
         person.latest_reqs = latest_reqs
-        person.days_since_completed_review = days_since
 
     return render(request, 'group/reviewer_overview.html',
                   construct_group_menu_context(request, group, "reviewers", group_type, {

ietf/review/admin.py

@@ -17,7 +17,7 @@ def acronym(self, obj):
 admin.site.register(ReviewerSettings, ReviewerSettingsAdmin)
 
 class ReviewSecretarySettingsAdmin(admin.ModelAdmin):
-    list_display = [u'id', 'team', 'person', 'remind_days_before_deadline', 'max_items_to_show_in_reviewer_list', 'days_to_show_in_reviewer_list']
+    list_display = [u'id', 'team', 'person', 'remind_days_before_deadline']
     raw_id_fields = ['team', 'person']
 admin.site.register(ReviewSecretarySettings, ReviewSecretarySettingsAdmin)
 

ietf/review/models.py

@@ -42,8 +42,6 @@ class ReviewSecretarySettings(models.Model):
     team        = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
     person      = ForeignKey(Person)
     remind_days_before_deadline = models.IntegerField(null=True, blank=True, help_text="To get an email reminder in case a reviewer forgets 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.")
-    max_items_to_show_in_reviewer_list = models.IntegerField(null=True, blank=True, help_text="Maximum number of completed items to show for one reviewer in the reviewer list view, the list is also filtered by the days to show in reviews list setting.")
-    days_to_show_in_reviewer_list = models.IntegerField(null=True, blank=True, help_text="Maximum number of days to show in reviewer list for completed items.")
 
     def __unicode__(self):
         return u"{} in {}".format(self.person, self.team)

ietf/templates/group/reviewer_overview.html

@@ -9,10 +9,6 @@
 {% block group_content %}
   {% origin %}
 
-  {% block pagehead %}
-    <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
-  {% endblock %}
-
   {% if can_access_stats %}
     <h1 class="pull-right"><a href="{% url "ietf.stats.views.review_stats" stats_type="completion" acronym=group.acronym %}" class="icon-link">&nbsp;<span class="small fa fa-bar-chart">&nbsp;</span></a></h1>
   {% endif %}
@@ -29,13 +25,11 @@ <h2>Reviewers</h2>
   </div>
 
   {% if reviewers %}
-    <table class="table reviewer-overview tablesorter">
+    <table class="table reviewer-overview">
       <thead>
         <tr>
-          <th>Next</th>
           <th>Reviewer</th>
           <th>Assigned/Deadline/state/time between assignment and closure for latest assignments</th>
-          <th>Days Since Completed</th>
           <th>Settings</th>
         </tr>
       </thead>
@@ -45,13 +39,12 @@ <h2>Reviewers</h2>
               {% elif person.busy %}class="busy"
               {% elif person.settings.skip_next %}class="skip-next"
               {% endif %}>
-            <td>{{ forloop.counter }}</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 %}
                   <tr>
-                    <td><span style="display:none">X</span>{{ assigned_time|date }}</td>
+                    <td>{{ assigned_time|date }}</td>
                     <td><a href="{% url "ietf.doc.views_review.review_request" name=doc_name request_id=req_pk %}">{{ deadline|date }}</a></td>
                     <td>
                       <span class="label label-{% if state.slug == "completed" or state.slug == "part-completed" %}success{% elif state.slug == "no-response" %}danger{% elif state.slug == "overtaken" %}warning{% elif state.slug == "requested" or state.slug == "accepted" %}primary{% else %}default{% endif %}">{{ state.name }}</span>
@@ -64,7 +57,6 @@ <h2>Reviewers</h2>
                 {% endfor %}
               </table>
             </td>
-            <td> {% if person.days_since_completed_review %} {{ person.days_since_completed_review }} {% else %} <span style="display:none">99999{% endif %} </td>
             <td>
               {% if person.settings.min_interval %}
                 {{ person.settings.get_min_interval_display }}<br>
@@ -92,7 +84,3 @@ <h2>Reviewers</h2>
   {% endif %}
 
 {% endblock %}
-
-{% block js %}
-  <script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
-{% endblock %}

ready-for-merge

@@ -7,8 +7,6 @@
 
 # --- Add entries at the top ---
 
-/personal/fenton/6.94.2.dev0@16108
-
 /personal/housley/6.87.4.dev0@15683
 
 /personal/rcross/6.81.3.dev0@15265