From a16198b861614de2232f6eceda04bd06e20254d8 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Thu, 3 Sep 2015 20:25:09 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=E4=BF=AE=E6=94=B9=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E9=80=BB=E8=BE=91,=E4=BF=AE=E6=AD=A3=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E5=8A=A0=E5=85=A5=E6=97=A0=E9=9C=80=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=9A=84=E5=B0=8F=E7=BB=84=E7=9A=84=E6=97=B6=E5=80=99=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E6=8F=90=E7=A4=BA,=E6=97=A0=E9=9C=80?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E5=B0=8F=E7=BB=84=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 group/serializers.py             |  2 +-
 group/views.py                   |  6 +++++-
 template/src/oj/group/group.html | 11 +++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/group/serializers.py b/group/serializers.py
index 065baf9..402ea5b 100644
--- a/group/serializers.py
+++ b/group/serializers.py
@@ -21,7 +21,7 @@ class EditGroupSerializer(serializers.Serializer):
 
 class CreateJoinGroupRequestSerializer(serializers.Serializer):
     group_id = serializers.IntegerField()
-    message = serializers.CharField(max_length=30)
+    message = serializers.CharField(max_length=30, required=False)
 
 
 class JoinGroupRequestSerializer(serializers.ModelSerializer):
diff --git a/group/views.py b/group/views.py
index d75aa98..2929706 100644
--- a/group/views.py
+++ b/group/views.py
@@ -183,6 +183,8 @@ class JoinGroupAPIView(APIView):
                 else:
                     return error_response(u"你已经是小组成员了")
             elif group.join_group_setting == 1:
+                if not data["message"]:
+                    return error_response(u"message : 该字段是必填项。")
                 try:
                     JoinGroupRequest.objects.get(user=request.user, group=group, status=False)
                     return error_response(u"你已经提交过申请了，请等待审核")
@@ -295,6 +297,7 @@ def group_page(request, group_id):
         return error_page(request, u"小组不存在")
     return render(request, "oj/group/group.html", {"group": group})
 
+
 @login_required
 def application_list_page(request, group_id):
     try:
@@ -305,6 +308,7 @@ def application_list_page(request, group_id):
     return render(request, "oj/group/my_application_list.html",
                   {"group": group, "applications": applications})
 
+
 @login_required
 def application_page(request, request_id):
     try:
@@ -312,4 +316,4 @@ def application_page(request, 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
+                  {"application": application})
diff --git a/template/src/oj/group/group.html b/template/src/oj/group/group.html
index 1686a4c..4fe3a00 100644
--- a/template/src/oj/group/group.html
+++ b/template/src/oj/group/group.html
@@ -4,8 +4,11 @@
 <div class="container main">
     <ul class="nav nav-tabs nav-tabs-google">
         <li role="presentation" class="active">
-            <a href="/group/{{ group.id }}/">详细信息</a></li>
+            <a href="/group/{{ group.id }}/">详细信息</a>
+        </li>
+        {% if group.join_group_setting %}
         <li role="presentation"><a href="/group/{{ group.id }}/applications/">我的申请</a></li>
+        {% endif %}
     </ul>
     <h2 class="text-center">{{ group.name }}</h2>
 
@@ -30,7 +33,11 @@
         </div>
         {% endif %}
         <div class="form-group">
-            <button class="btn btn-primary" id="sendApplication">申请加入</button>
+            <button class="btn btn-primary" id="sendApplication">
+            {% if group.join_group_setting %}
+                申请
+            {% endif %}
+                加入</button>
         </div>
     </div>
 </div>