From 334767fa6fe354138bb016d3a124ea4a00445b33 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Thu, 14 Mar 2019 19:14:33 +0000
Subject: [PATCH] Some admin tweaks and removal of a dead template. Tests all
 pass now. Functionality is still not right.  - Legacy-Id: 16032

---
 ietf/doc/admin.py                              |  4 +++-
 ietf/name/admin.py                             |  3 ++-
 ietf/review/admin.py                           | 11 ++++++++++-
 ietf/templates/doc/review_request_summary.html | 12 ------------
 4 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 ietf/templates/doc/review_request_summary.html

diff --git a/ietf/doc/admin.py b/ietf/doc/admin.py
index 55285b49d..d61ccb191 100644
--- a/ietf/doc/admin.py
+++ b/ietf/doc/admin.py
@@ -5,7 +5,8 @@ from models import (StateType, State, RelatedDocument, DocumentAuthor, Document,
     DocHistoryAuthor, DocHistory, DocAlias, DocReminder, DocEvent, NewRevisionDocEvent,
     StateDocEvent, ConsensusDocEvent, BallotType, BallotDocEvent, WriteupDocEvent, LastCallDocEvent,
     TelechatDocEvent, BallotPositionDocEvent, ReviewRequestDocEvent, InitialReviewDocEvent,
-    AddedMessageEvent, SubmissionDocEvent, DeletedEvent, EditedAuthorsDocEvent, DocumentURL)
+    AddedMessageEvent, SubmissionDocEvent, DeletedEvent, EditedAuthorsDocEvent, DocumentURL,
+    ReviewAssignmentDocEvent )
 
 
 class StateTypeAdmin(admin.ModelAdmin):
@@ -143,6 +144,7 @@ admin.site.register(WriteupDocEvent, DocEventAdmin)
 admin.site.register(LastCallDocEvent, DocEventAdmin)
 admin.site.register(TelechatDocEvent, DocEventAdmin)
 admin.site.register(ReviewRequestDocEvent, DocEventAdmin)
+admin.site.register(ReviewAssignmentDocEvent, DocEventAdmin)
 admin.site.register(InitialReviewDocEvent, DocEventAdmin)
 admin.site.register(AddedMessageEvent, DocEventAdmin)
 admin.site.register(SubmissionDocEvent, DocEventAdmin)
diff --git a/ietf/name/admin.py b/ietf/name/admin.py
index 9eb0f5cc5..3924b7910 100644
--- a/ietf/name/admin.py
+++ b/ietf/name/admin.py
@@ -9,7 +9,7 @@ from ietf.name.models import (
     LiaisonStatementState, LiaisonStatementTagName, MeetingTypeName, NomineePositionStateName,
     ReviewRequestStateName, ReviewResultName, ReviewTypeName, RoleName, RoomResourceName,
     SessionStatusName, StdLevelName, StreamName, TimeSlotTypeName, TopicAudienceName,
-    DocUrlTagName)
+    DocUrlTagName, ReviewAssignmentStateName)
 
 from ietf.stats.models import CountryAlias
 
@@ -68,6 +68,7 @@ admin.site.register(LiaisonStatementTagName, NameAdmin)
 admin.site.register(MeetingTypeName, NameAdmin)
 admin.site.register(NomineePositionStateName, NameAdmin)
 admin.site.register(ReviewRequestStateName, NameAdmin)
+admin.site.register(ReviewAssignmentStateName, NameAdmin)
 admin.site.register(ReviewResultName, NameAdmin)
 admin.site.register(ReviewTypeName, NameAdmin)
 admin.site.register(RoleName, NameAdmin)
diff --git a/ietf/review/admin.py b/ietf/review/admin.py
index 7b2a01205..4fbe41059 100644
--- a/ietf/review/admin.py
+++ b/ietf/review/admin.py
@@ -3,7 +3,7 @@ import simple_history
 from django.contrib import admin
 
 from ietf.review.models import (ReviewerSettings, ReviewSecretarySettings, UnavailablePeriod,
-    ReviewWish, NextReviewerInTeam, ReviewRequest, ReviewTeamSettings )
+    ReviewWish, NextReviewerInTeam, ReviewRequest, ReviewAssignment, ReviewTeamSettings )
 
 class ReviewerSettingsAdmin(simple_history.admin.SimpleHistoryAdmin):
     def acronym(self, obj):
@@ -61,6 +61,15 @@ class ReviewRequestAdmin(admin.ModelAdmin):
 
 admin.site.register(ReviewRequest, ReviewRequestAdmin)
 
+class ReviewAssignmentAdmin(admin.ModelAdmin):
+    list_display = ["review_request", "reviewer", "assigned_on", "result"]
+    list_filter = ["result", "state"]
+    ordering = ["-id"]
+    raw_id_fields = ["reviewer", "result"]
+    search_fields = ["review_request__doc__name"]
+
+admin.site.register(ReviewAssignment, ReviewAssignmentAdmin)
+
 class ReviewTeamSettingsAdmin(admin.ModelAdmin):
     list_display = ["group", ] 
     search_fields = ["group__acronym", ]
diff --git a/ietf/templates/doc/review_request_summary.html b/ietf/templates/doc/review_request_summary.html
deleted file mode 100644
index e06b8176a..000000000
--- a/ietf/templates/doc/review_request_summary.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="review-request-summary">
-  {% if review_request.state_id == "completed" or review_request.state_id == "part-completed" %}
-    <a href="{% if review_request.review %}{% url "ietf.doc.views_doc.document_main" review_request.review.name %}{% else %}{% url "ietf.doc.views_review.review_request" review_request.doc_id review_request.pk %}{% endif %}">
-      {{ review_request.team.acronym|upper }} {{ review_request.type.name }} Review{% if review_request.reviewed_rev and review_request.reviewed_rev != current_rev or review_request.doc_id != current_doc_name %} (of {% if review_request.doc_id != current_doc_name %}{{ review_request.doc_id }}{% endif %}-{{ review_request.reviewed_rev }}){% endif %}{% if review_request.result %}:
-      {{ review_request.result.name }}{% endif %} {% if review_request.state_id == "part-completed" %}(partially completed){% endif %}
-    </a>
-  {% else %}
-    <i>
-    <a href="{% url "ietf.doc.views_review.review_request" review_request.doc_id review_request.pk %}">{{ review_request.team.acronym|upper }} {{ review_request.type.name }} Review
-      - due: {{ review_request.deadline|date:"Y-m-d" }}</a></i>
-  {% endif %}
-</div>