Accept Merge Request #153 更新测试服务器代码 : (dev-sxw -> for-contest)

Merge Request: 更新测试服务器代码
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/153

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):

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})
+                  {"application": application})

static/src/js/app/oj/group/group.js

@@ -1,9 +1,14 @@
 require(["jquery", "csrfToken", "bsAlert"], function ($, csrfTokenHeader, bsAlert) {
     $("#sendApplication").click(function (){
-        var message = $("#applyMessage").val();
+        var message;
-        console.log(message);
+        if ($("#applyMessage").length) {
+            message = $("#applyMessage").val();
+            if (!message)
+                bsAlert("提交失败,请填写申请信息!");
+                return false;
+        }
+
         var groupId = window.location.pathname.split("/")[2];
-        console.log(groupId);
         data = {group_id: groupId,message:message}
         $.ajax({
             url: "/api/group_join/",

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>