修复代码冲突

contest/views.py

@@ -293,7 +293,8 @@ def contest_list_page(request, page=1):
     # 筛选我能参加的比赛
     join = request.GET.get("join", None)
     if join:
-        contests = Contest.objects.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all()))
+        contests = Contest.objects.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all())).\
+            filter(end_time__gt=datetime.datetime.now(), start_time__lt=datetime.datetime.now())
 
     paginator = Paginator(contests, 20)
     try:

static/src/css/admin.css

@@ -6,14 +6,16 @@
 @import url("webuploader/webuploader.css");
 @import url("datetime_picker/bootstrap-datetimepicker.css");
 @import url("tagEditor/jquery.tag-editor.css");
-@import url("contest/add_contest.css");
 
 #loading-gif {
     width: 40px;
     height: 40px;
     margin: auto;
     position: absolute;
-    top: 0; left: 0; bottom: 0; right: 0;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
 }
 
 .line-chart {
@@ -39,3 +41,17 @@
     border: 1px solid #d9d9d9;
     border-top-color: silver;
 }
+
+.group-tag {
+    color: #46799b;
+    background: #e0eaf1;
+    white-space: nowrap;
+    overflow: hidden;
+    cursor: pointer;
+    border-radius: 2px 0 0 2px;
+    float: left;
+    padding: 0 4px;
+    box-sizing: border-box;
+    list-style-type: none;
+    margin: 5px;
+}

static/src/js/app/admin/contest/contest_list.js

@@ -133,27 +133,6 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
                     bsAlert(data.data);
                 }
             }
-
-
-			beforeSend: csrfTokenHeader,
-			url: url,
-			dataType: "json",
-			method: "get",
-			contentType: "application/json",
-			success: function (data) {
-				if (!data.code) {
-				    if (isSuperAdmin)
-						vm.groupList.push({id:0, name:"所有人", chose: false});
-					for (var key in data.data) {
-						data.data[key].chose = false;
-						vm.groupList.push(data.data[key]);
-					}
-				}
-				else {
-					bsAlert(data.data);
-					console.log(data);
-		    	}
-			}
         });
     });
     avalon.scan();