From e84039eea194d43c2fa779500f49e398da0be784 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Fri, 14 Aug 2015 10:21:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=BB=E8=BE=91=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E7=94=A8=E6=88=B7=E5=90=8D=E9=87=8D=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account/tests.py | 4 ++-- account/views.py | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/account/tests.py b/account/tests.py index aca8971..aa21bc7 100644 --- a/account/tests.py +++ b/account/tests.py @@ -145,10 +145,10 @@ class UserChangePasswordAPITest(APITestCase): self.assertEqual(response.data, {"code": 0, "data": u"用户密码修改成功！"}) -class UserAPITest(APITestCase): +class UserAdminAPITest(APITestCase): def setUp(self): self.client = APIClient() - self.url = reverse("user_list_api") + self.url = reverse("user_admin_api") user = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN) user.set_password("testxx") user.save() diff --git a/account/views.py b/account/views.py index f053903..f2c6ca3 100644 --- a/account/views.py +++ b/account/views.py @@ -135,6 +135,12 @@ class UserAdminAPIView(APIView): user = User.objects.get(id=data["id"]) except User.DoesNotExist: return error_response(u"该用户不存在！") + try: + user = User.objects.get(username=data["username"]) + if user.id != data["id"]: + return error_response(u"昵称已经存在") + except User.DoesNotExist: + pass user.username = data["username"] user.real_name = data["real_name"] user.email = data["email"]