From 2ef404b83e042ec349fe7f0498ad7d6a5a480168 Mon Sep 17 00:00:00 2001
From: John Eskew <jeskew@edx.org>
Date: Mon, 7 May 2018 18:10:33 -0400
Subject: [PATCH] Fix two deprecation warnings.

---
 lms/djangoapps/shoppingcart/models.py              |  2 ++
 .../user_api/accounts/tests/test_models.py         |  4 ++--
 openedx/core/djangoapps/user_api/admin.py          | 14 +++++++++++++-
 openedx/core/djangoapps/user_api/models.py         |  3 +++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/shoppingcart/models.py b/lms/djangoapps/shoppingcart/models.py
index cdae548483..54edf2df70 100644
--- a/lms/djangoapps/shoppingcart/models.py
+++ b/lms/djangoapps/shoppingcart/models.py
@@ -645,6 +645,7 @@ class OrderItem(TimeStampedModel):
     """
     class Meta(object):
         app_label = "shoppingcart"
+        base_manager_name = 'objects'
 
     objects = InheritanceManager()
     order = models.ForeignKey(Order, db_index=True)
@@ -1091,6 +1092,7 @@ class InvoiceItem(TimeStampedModel):
     """
     class Meta(object):
         app_label = "shoppingcart"
+        base_manager_name = 'objects'
 
     objects = InheritanceManager()
     invoice = models.ForeignKey(Invoice, db_index=True)
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_models.py b/openedx/core/djangoapps/user_api/accounts/tests/test_models.py
index 8088d32087..1f59f86c31 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_models.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_models.py
@@ -99,7 +99,7 @@ def test_retirement_request_create_success():
     Ensure that retirement request record creation succeeds.
     """
     user = UserFactory()
-    retirement = UserRetirementRequest.create_retirement_request(user)
+    UserRetirementRequest.create_retirement_request(user)
     assert UserRetirementRequest.has_user_requested_retirement(user)
 
 
@@ -108,7 +108,7 @@ def test_retirement_request_created_upon_status(setup_retirement_states):  # pyl
     Ensure that retirement request record is created upon retirement status creation.
     """
     user = UserFactory()
-    retirement = UserRetirementStatus.create_retirement(user)
+    UserRetirementStatus.create_retirement(user)
     assert UserRetirementRequest.has_user_requested_retirement(user)
 
 
diff --git a/openedx/core/djangoapps/user_api/admin.py b/openedx/core/djangoapps/user_api/admin.py
index 0ea9aac4d4..62f3aae3b0 100644
--- a/openedx/core/djangoapps/user_api/admin.py
+++ b/openedx/core/djangoapps/user_api/admin.py
@@ -3,7 +3,7 @@ Django admin configuration pages for the user_api app
 """
 from django.contrib import admin
 
-from .models import RetirementState, UserRetirementStatus
+from .models import RetirementState, UserRetirementStatus, UserRetirementRequest
 
 
 @admin.register(RetirementState)
@@ -31,3 +31,15 @@ class UserRetirementStatusAdmin(admin.ModelAdmin):
 
     class Meta(object):
         model = UserRetirementStatus
+
+
+@admin.register(UserRetirementRequest)
+class UserRetirementRequestAdmin(admin.ModelAdmin):
+    """
+    Admin interface for the UserRetirementRequestAdmin model.
+    """
+    list_display = ('user', 'created')
+    raw_id_fields = ('user',)
+
+    class Meta(object):
+        model = UserRetirementRequest
diff --git a/openedx/core/djangoapps/user_api/models.py b/openedx/core/djangoapps/user_api/models.py
index 3a135c4508..8fce760f89 100644
--- a/openedx/core/djangoapps/user_api/models.py
+++ b/openedx/core/djangoapps/user_api/models.py
@@ -195,6 +195,9 @@ class UserRetirementRequest(TimeStampedModel):
         """
         return cls.objects.filter(user=user).exists()
 
+    def __unicode__(self):
+        return u'User: {} Requested: {}'.format(self.user.id, self.created)
+
 
 class UserRetirementStatus(TimeStampedModel):
     """