Accept Merge Request QingdaoU#231 修改部分 jquery 插件为 AMD 模块 : (virusdefe…

…nder-dev -> dev)

Merge Request: 修改部分 jquery 插件为 AMD 模块
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/231

.gitignore

@@ -61,4 +61,5 @@ static/release/img
 static/src/upload_image/*
 build.txt
 tmp/
-test_case/
+test_case/
+release/

announcement/views.py

@@ -16,8 +16,21 @@ def announcement_page(request, announcement_id):
     try:
         announcement = Announcement.objects.get(id=announcement_id, visible=True)
     except Announcement.DoesNotExist:
-        return error_page(request, u"模板不存在")
-    return render(request, "oj/announcement/announcement.html", {"announcement": announcement})
+        return error_page(request, u"公告不存在")
+    # 公开的公告
+    if announcement.is_global == 0:
+        return render(request, "oj/announcement/announcement.html", {"announcement": announcement})
+    else:
+        if not request.user.is_authenticated():
+            return error_page(request, u"公告不存在")
+        # 判断是不是在组里面
+        if request.user.admin_type == SUPER_ADMIN or request.user == announcement.created_by:
+            return render(request, "oj/announcement/announcement.html", {"announcement": announcement})
+        else:
+            if request.user.groups.filter(id__in=[item.id for item in announcement.groups.all()]).exists():
+                return render(request, "oj/announcement/announcement.html", {"announcement": announcement})
+            else:
+                return error_page(request, u"公告不存在")
 
 
 class AnnouncementAdminAPIView(APIView):

contest/models.py

@@ -6,10 +6,9 @@
 from problem.models import AbstractProblem
 from group.models import Group
 
-
 GROUP_CONTEST = 0
 PUBLIC_CONTEST = 1
-PASSWORD_PUBLIC_CONTEST = 2
+PASSWORD_PROTECTED_CONTEST = 2
 
 
 class Contest(models.Model):