From 37defa0266a2eaf74464046ce427017a89da5d3a Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Mon, 31 Aug 2015 20:52:18 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=90=8E=E7=AB=AF]=E8=BF=99=E6=AC=A1commit?=
 =?UTF-8?q?=E8=B7=9F=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=B4=A7=E5=AF=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3,=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=8E=A5=E5=8F=97?=
 =?UTF-8?q?=E5=92=8C=E6=8B=92=E7=BB=9D=E8=AF=B7=E6=B1=82=E6=97=B6=E5=AF=B9?=
 =?UTF-8?q?models=E9=87=8C=E6=96=B0=E5=8A=A0=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 group/views.py | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/group/views.py b/group/views.py
index 6a9d2d1..d75aa98 100644
--- a/group/views.py
+++ b/group/views.py
@@ -236,9 +236,10 @@ class JoinGroupRequestAdminAPIView(APIView, GroupAPIViewBase):
 
             join_request.status = True
             join_request.save()
-
             if data["status"]:
                 if join_group(join_request.user, join_request.group):
+                    join_request.accepted = True
+                    join_request.save()
                     return success_response(u"加入成功")
                 else:
                     return error_response(u"加入失败，已经在本小组内")
@@ -248,6 +249,7 @@ class JoinGroupRequestAdminAPIView(APIView, GroupAPIViewBase):
         else:
             return serializer_invalid_response(serializer)
 
+
 @login_required
 def group_list_page(request, page=1):
     # 右侧的公告列表
@@ -283,3 +285,31 @@ def group_list_page(request, page=1):
         "previous_page": previous_page, "next_page": next_page,
         "keyword": keyword, "announcements": announcements,
     })
+
+
+@login_required
+def group_page(request, group_id):
+    try:
+        group = Group.objects.get(id=group_id, visible=True)
+    except Group.DoesNotExist:
+        return error_page(request, u"小组不存在")
+    return render(request, "oj/group/group.html", {"group": group})
+
+@login_required
+def application_list_page(request, group_id):
+    try:
+        group = Group.objects.get(id=group_id, visible=True)
+    except Group.DoesNotExist:
+        return error_page(request, u"小组不存在")
+    applications = JoinGroupRequest.objects.filter(user=request.user, group=group)
+    return render(request, "oj/group/my_application_list.html",
+                  {"group": group, "applications": applications})
+
+@login_required
+def application_page(request, request_id):
+    try:
+        application = JoinGroupRequest.objects.get(user=request.user, pk=request_id)
+    except JoinGroupRequest.DoesNotExist:
+        return error_page(request, u"申请不存在")
+    return render(request, "oj/group/my_application.html",
+                  {"application": application})
\ No newline at end of file