From b13f487d530a761cf5a9399b4dda126f9d67c378 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sat, 5 Sep 2015 22:04:40 +0800
Subject: [PATCH 01/38] update views.py

---
 contest/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contest/views.py b/contest/views.py
index eaef55b..58fcf5d 100644
--- a/contest/views.py
+++ b/contest/views.py
@@ -357,7 +357,7 @@ def contest_list_page(request, page=1):
 
     # 筛选我能参加的比赛
     join = request.GET.get("join", None)
-    if join:
+    if join and request.user.id:
         contests = contests.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())
 

From 51601c34d876c46f5211acbfe49478e0e5f7eba6 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sat, 5 Sep 2015 22:15:34 +0800
Subject: [PATCH 02/38] =?UTF-8?q?update=20contest=5Flist.html=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6=E5=B0=B1=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=AF=B9=E5=8F=AF=E4=BB=A5=E5=8F=82=E5=8A=A0=E7=9A=84?=
 =?UTF-8?q?=E6=AF=94=E8=B5=9B=E7=9A=84=E7=AD=9B=E9=80=89=EF=BC=8C=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E8=BF=99=E6=B2=A1=E6=9C=89=E6=84=8F=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/oj/contest/contest_list.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/src/oj/contest/contest_list.html b/template/src/oj/contest/contest_list.html
index 25b8eae..51e522d 100644
--- a/template/src/oj/contest/contest_list.html
+++ b/template/src/oj/contest/contest_list.html
@@ -48,12 +48,13 @@
                         {% endfor %}
                         </tbody>
                     </table>
-
+                    {% if request.user.is_authenticated  %}
                     <div class="form-group">
                         <label>仅显示当前可参加的比赛
                             <input id="join" type="checkbox" {% if join %}checked{% endif %} onchange="if(this.checked){location.href='/contests/?join=True'}else{location.href='/contests/'}">
                         </label>
                     </div>
+                    {% endif %}
                     <nav>
                         <ul class="pager">
                             {% if previous_page %}

From 1a8c8786cce9fc807a5fdd8aa0e3bbbdec0b1e8c Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sat, 5 Sep 2015 22:17:21 +0800
Subject: [PATCH 03/38] =?UTF-8?q?update=20views.py=20=E8=BF=99=E4=B8=AA?=
 =?UTF-8?q?=E8=BF=98=E6=9C=89=E5=88=9A=E5=88=9A=E4=BF=AE=E6=94=B9=E8=BF=99?=
 =?UTF-8?q?=E4=B8=AA=E6=96=87=E4=BB=B6=E6=98=AF=E4=B8=BA=E4=BA=86=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E7=94=A8=E6=88=B7=E6=9C=AA=E7=99=BB=E5=BD=95=E6=98=AF?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5join=E5=8F=82=E6=95=B0=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E5=BC=95=E5=8F=91500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contest/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contest/views.py b/contest/views.py
index 58fcf5d..2c03f75 100644
--- a/contest/views.py
+++ b/contest/views.py
@@ -357,7 +357,7 @@ def contest_list_page(request, page=1):
 
     # 筛选我能参加的比赛
     join = request.GET.get("join", None)
-    if join and request.user.id:
+    if request.user.is_authenticated and join:
         contests = contests.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())
 

From a8d25fa0f18aa6e4bd139314f5bb5b30fb760b08 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sat, 5 Sep 2015 23:13:03 +0800
Subject: [PATCH 04/38] =?UTF-8?q?update=20loose=5Fclient.py=20=20=20=20=20?=
 =?UTF-8?q?=E8=AF=A5=E6=A8=A1=E5=BC=8F=E9=9C=80=E8=A6=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8Fjudge=5Fmodel=3Dloose?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=20=E5=B0=9D=E8=AF=95=E5=86=99=E4=BA=86?=
 =?UTF-8?q?=E4=BA=86=E5=AE=BD=E6=9D=BE=E5=88=A4=E9=A2=98=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E4=BC=9AAC=E4=BB=A5=E4=B8=8B3=E7=A7=8D?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=9A=20=E5=BF=BD=E7=95=A5=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=BB=93=E5=B0=BE=E7=9A=84\n,=20=E4=BB=A5=E5=8F=8Alru?=
 =?UTF-8?q?n=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6=E2=80=9C=E6=AF=8F?=
 =?UTF-8?q?=E8=A1=8C=E2=80=9D=E6=9C=80=E5=90=8E=E7=9A=84=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=88=E5=8F=AF=E4=BB=A5=E5=A4=9A=E4=B8=AA=EF=BC=89=20?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=BB=93=E5=B0=BE=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E7=A9=BA=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

结尾多空格不AC，文件中间多空行不AC
---
 judge/judger/loose_client.py | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/judge/judger/loose_client.py b/judge/judger/loose_client.py
index e3d2540..eec9e2e 100644
--- a/judge/judger/loose_client.py
+++ b/judge/judger/loose_client.py
@@ -93,15 +93,26 @@ class JudgeClient(object):
         except IOError:
             # 文件不存在等引发的异常 返回结果错误
             return False
-        lines=std.readline()
-        line_conut = len(lines)
-        for i in range(0, line_conut-2):
-            if lines[i]
-
-
-
-
-
+        sline = std.readline().strip('\n')
+        line = f.readline().strip('\n')
+        while sline:
+            try:
+                while line[-1]==' ':
+                    line = line[:-1]
+            except IndexError:
+                return False
+            if sline != line: 
+                return False
+            sline = std.readline().strip('\n')
+            line = f.readline().strip('\n')
+        if line:
+            return False
+        line = f.readline()
+        while line and line == '\n':
+            line = f.readline()
+        if line:
+            return False
+        return True
 
     def _judge_one(self, test_case_id):
         # 运行lrun程序 接收返回值

From 83dd38f75183d5f7494953c2090e3ebe33fdf9fc Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sat, 5 Sep 2015 23:45:51 +0800
Subject: [PATCH 05/38] =?UTF-8?q?update=20loose=5Fclient.py=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=87=BD=E6=95=B0=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 judge/judger/loose_client.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/judge/judger/loose_client.py b/judge/judger/loose_client.py
index eec9e2e..f0c825f 100644
--- a/judge/judger/loose_client.py
+++ b/judge/judger/loose_client.py
@@ -38,6 +38,16 @@ class JudgeClient(object):
         self._test_case_dir = test_case_dir
         # 进程池
         self._pool = Pool(processes=max_running_number)
+        self._test_case_info = self._load_test_case_info()
+    def _load_test_case_info(self):
+        # 读取测试用例信息 转换为dict
+        try:
+            f = open(self._test_case_dir + "info")
+            return json.loads(f.read())
+        except IOError:
+            raise JudgeClientError("Test case config file not found")
+        except ValueError:
+            raise JudgeClientError("Test case config file format error")
 
     def _generate_command(self, test_case_id):
         """

From 0ba1f0ab701afa83c300ee4365dc187ca5d20f7b Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sat, 5 Sep 2015 23:53:18 +0800
Subject: [PATCH 06/38] =?UTF-8?q?update=20loose=5Fclient.py=20=E5=B0=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8Cstr=EF=BC=88=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=EF=BC=89+=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 judge/judger/loose_client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/judge/judger/loose_client.py b/judge/judger/loose_client.py
index f0c825f..203bad0 100644
--- a/judge/judger/loose_client.py
+++ b/judge/judger/loose_client.py
@@ -99,7 +99,7 @@ class JudgeClient(object):
             # 文件不存在等引发的异常 返回结果错误
             return False
         try:
-            std = open(self._test_case_dir+test_case_id+".out", "r")
+            std = open(self._test_case_dir+str(test_case_id)+".out", "r")
         except IOError:
             # 文件不存在等引发的异常 返回结果错误
             return False

From 6a8e327e80a9cbe69b3c0d8b1e5349f46bbcdd9c Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 08:11:06 +0800
Subject: [PATCH 07/38] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BA=86=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=96=87=E4=BB=B6=E5=A4=B9,=E9=87=8C=E8=BE=B9?=
 =?UTF-8?q?=E6=94=BE=E4=B8=80=E4=BA=9Boj=E7=9A=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7,=E4=B9=9F=E5=8F=AF=E8=83=BD=E6=98=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=E7=9A=84=E6=AD=A3=E5=BC=8F=E7=9A=84=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Accessories/utils.py

diff --git a/Accessories/utils.py b/Accessories/utils.py
new file mode 100644
index 0000000..751b51c
--- /dev/null
+++ b/Accessories/utils.py
@@ -0,0 +1,9 @@
+import django
+from contest.models import Contest
+django.setup()
+
+def add_exist_problem_to_contest(problems, contest_id):
+    for problem in problems:
+        print problem.title
+        
+    return

From 937f77e4bce0e6e16fb4e61892a990accfe3eea3 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 08:22:20 +0800
Subject: [PATCH 08/38] =?UTF-8?q?=E6=8A=8AAccessories=E4=B9=9F=E5=BC=84?=
 =?UTF-8?q?=E6=88=90=E4=B8=80=E4=B8=AAmodel,=E4=BB=A5=E4=BE=BF=E5=9C=A8man?=
 =?UTF-8?q?age.py=20shell=E9=87=8C=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/__init__.py | 1 +
 Accessories/utils.py    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 Accessories/__init__.py

diff --git a/Accessories/__init__.py b/Accessories/__init__.py
new file mode 100644
index 0000000..3ed9fd0
--- /dev/null
+++ b/Accessories/__init__.py
@@ -0,0 +1 @@
+__author__ = 'root'
diff --git a/Accessories/utils.py b/Accessories/utils.py
index 751b51c..fea32c6 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -5,5 +5,5 @@ django.setup()
 def add_exist_problem_to_contest(problems, contest_id):
     for problem in problems:
         print problem.title
-        
+
     return

From a6ee2b217238851e836c7c3efaec870cce8d1808 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 08:39:00 +0800
Subject: [PATCH 09/38] =?UTF-8?q?Accessories:=E6=B7=BB=E5=8A=A0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BB=8E=E5=B7=B2=E6=9C=89=E7=9A=84=E6=AF=94=E8=B5=9B?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=88=9B=E5=BB=BA=E6=AF=94=E8=B5=9B!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/Accessories/utils.py b/Accessories/utils.py
index fea32c6..e0cd879 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -1,9 +1,27 @@
 import django
-from contest.models import Contest
+from contest.models import *
+
 django.setup()
 
-def add_exist_problem_to_contest(problems, contest_id):
-    for problem in problems:
-        print problem.title
 
+def add_exist_problem_to_contest(problems, contest_id):
+    try:
+        contest = Contest.objects.get(pk=contest_id)
+    except Contest.DoesNotExist:
+        print "Contest Doesn't Exist!"
+        return
+    i = 1
+    for problem in problems:
+        print "Add the problem:"
+        print problem.title
+        ContestProblem.create(contest, sort_index=str(i),
+                              title=problem.title, description=problem.description,
+                              input_description=problem.input_description,
+                              output_description=problem.output_description,
+                              samples=problem.samples,
+                              test_case_id=problem.test_case_id,
+                              hint=problem.hint,
+                              created_by=problem.created_by,
+                              time_limit=problem.time_limit,
+                              memory_limit=problem.memory_limit)
     return

From 40c79e85b852d027adf135e23bcd11e20513ea0f Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 08:43:40 +0800
Subject: [PATCH 10/38] =?UTF-8?q?Accessories:=E4=BF=AE=E6=AD=A3=E5=88=9A?=
 =?UTF-8?q?=E5=88=9A=E6=8F=90=E4=BA=A4=E7=9A=84=E9=94=99=E8=AF=AF,?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E8=AF=A5=E8=84=9A=E6=9C=AC=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E5=9C=A8=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=8A=E8=B7=91....?=
 =?UTF-8?q?=E6=89=80=E4=BB=A5=E8=AF=95=E4=BA=86=E6=89=8D=E5=8F=91=E7=8E=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Accessories/utils.py b/Accessories/utils.py
index e0cd879..49f0ea6 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -14,7 +14,7 @@ def add_exist_problem_to_contest(problems, contest_id):
     for problem in problems:
         print "Add the problem:"
         print problem.title
-        ContestProblem.create(contest, sort_index=str(i),
+        ContestProblem.bujects.create(contest, sort_index=str(i),
                               title=problem.title, description=problem.description,
                               input_description=problem.input_description,
                               output_description=problem.output_description,

From 2fbb1b2f8be5a51e79692aef6fd35c44ceb92576 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 08:48:44 +0800
Subject: [PATCH 11/38] =?UTF-8?q?Accessories:=E4=BF=AE=E6=AD=A3=E5=88=9A?=
 =?UTF-8?q?=E5=88=9A=E6=8F=90=E4=BA=A4=E7=9A=84typo,(=E6=88=91=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E5=86=8D=E5=88=B7commit=E7=9C=9F=E7=9A=84=E5=86=99?=
 =?UTF-8?q?=E9=94=99=E4=BA=86T=5FT)[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Accessories/utils.py b/Accessories/utils.py
index 49f0ea6..2654127 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -14,7 +14,7 @@ def add_exist_problem_to_contest(problems, contest_id):
     for problem in problems:
         print "Add the problem:"
         print problem.title
-        ContestProblem.bujects.create(contest, sort_index=str(i),
+        ContestProblem.objects.create(contest, sort_index=str(i),
                               title=problem.title, description=problem.description,
                               input_description=problem.input_description,
                               output_description=problem.output_description,

From 8ea8c5c11e0cd4dec510980258197e8e728302a9 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 08:51:37 +0800
Subject: [PATCH 12/38] =?UTF-8?q?Accessories:=E5=8F=88=E5=86=99=E9=94=99?=
 =?UTF-8?q?=E4=BA=86T=5FT[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Accessories/utils.py b/Accessories/utils.py
index 2654127..4869b54 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -14,7 +14,7 @@ def add_exist_problem_to_contest(problems, contest_id):
     for problem in problems:
         print "Add the problem:"
         print problem.title
-        ContestProblem.objects.create(contest, sort_index=str(i),
+        ContestProblem.objects.create(contest=contest, sort_index=str(i),
                               title=problem.title, description=problem.description,
                               input_description=problem.input_description,
                               output_description=problem.output_description,

From 9a689e50922e6fbc2bc5dd13cd6006b54e6a189e Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 09:37:02 +0800
Subject: [PATCH 13/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=88=A4=E9=A2=98=E7=9A=84=E8=84=9A=E6=9C=AC,=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=9C=89=E9=80=89=E6=8B=A9=E5=9C=B0=E9=87=8D=E5=88=A4?=
 =?UTF-8?q?=E4=B8=80=E9=83=A8=E5=88=86=E6=8F=90=E4=BA=A4,=E5=B9=B6?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=B0=E7=9A=84=E6=8F=90=E4=BA=A4,?=
 =?UTF-8?q?=E5=8F=AF=E6=8C=87=E5=AE=9A=E7=94=A8=E6=88=B7~[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/reJudge.py | 74 ++++++++++++++++++++++++++++++++++++++++++
 Accessories/utils.py   |  2 ++
 2 files changed, 76 insertions(+)
 create mode 100644 Accessories/reJudge.py

diff --git a/Accessories/reJudge.py b/Accessories/reJudge.py
new file mode 100644
index 0000000..75cc9b1
--- /dev/null
+++ b/Accessories/reJudge.py
@@ -0,0 +1,74 @@
+import django
+from contest.models import *
+from problem.models import *
+from submission.models import Submission
+
+import redis
+
+from judge.judger_controller.tasks import judge
+from judge.judger_controller.settings import redis_config
+
+django.setup()
+
+
+def rejudge(submission):
+    # for submission in submission:
+    #   submission_id = submission.id
+    #  try:
+    #     command = "%s run -t -i --privileged --rm=true " \
+    #              "-v %s:/var/judger/test_case/ " \
+    #             "-v %s:/var/judger/code/ " \
+    #            "%s " \
+    #           "python judge/judger/run.py " \
+    #          "--solution_id %s --time_limit %s --memory_limit %s --test_case_id %s" % \
+    #         (docker_config["docker_path"],
+    #         test_case_dir,
+    #        source_code_dir,
+    #       docker_config["image_name"],
+    #      submission_id, str(time_limit), str(memory_limit), test_case_id)
+    # subprocess.call(command, shell=docker_config["shell"])
+    # except Exception as e:
+    #     print e
+    return
+
+
+def easy_rejudge(submissions, map_table, user_id, contest_id=None):
+    try:
+        user = User.objects.get(pk=user_id)
+    except User.DoesNotExist:
+        print "User.DoesNotExist!"
+        return
+    problemDict = {}
+    for oldSubmission in submission:
+        problem_id = map_table[oldSubmission.problem_id]
+
+        if problem_id in problemDict:
+            problem = problemDict[problem_id]
+        else:
+            try:
+                p = Problem.objects.get(pk=problem_id)
+            except Problem.DoesNotExist:
+                print " Problem.DoesNotExist!" + str(problem_id)
+                continue
+            problem = p
+            problemDict[problem_id] = p
+
+        submission = Submission.objects.create(
+            user_id=user_id,
+            language=oldSubmission.language,
+            code=oldSubmission.code,
+            contest_id=contest_id,
+            problem_id=problem_id,
+            originResult=oldSubmission.result
+        )
+        try:
+            judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id)
+        except Exception:
+            print "提交判题任务失败"
+            continue
+        # 增加redis 中判题队列长度的计数器
+        r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"])
+        r.incr("judge_queue_length")
+
+    return
+
diff --git a/Accessories/utils.py b/Accessories/utils.py
index 4869b54..264bd55 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -14,6 +14,7 @@ def add_exist_problem_to_contest(problems, contest_id):
     for problem in problems:
         print "Add the problem:"
         print problem.title
+        print "The sort Index is" + str(i) + " You Can modify it latter as you like~"
         ContestProblem.objects.create(contest=contest, sort_index=str(i),
                               title=problem.title, description=problem.description,
                               input_description=problem.input_description,
@@ -24,4 +25,5 @@ def add_exist_problem_to_contest(problems, contest_id):
                               created_by=problem.created_by,
                               time_limit=problem.time_limit,
                               memory_limit=problem.memory_limit)
+        i += 1
     return

From 3ff1a8d865107655b4cfb4199c879c9977a512be Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 09:45:32 +0800
Subject: [PATCH 14/38] =?UTF-8?q?Accessories:=E4=BF=AE=E6=94=B9=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E9=94=99=E8=AF=AF[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/reJudge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Accessories/reJudge.py b/Accessories/reJudge.py
index 75cc9b1..62f8ef8 100644
--- a/Accessories/reJudge.py
+++ b/Accessories/reJudge.py
@@ -64,7 +64,7 @@ def easy_rejudge(submissions, map_table, user_id, contest_id=None):
         try:
             judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id)
         except Exception:
-            print "提交判题任务失败"
+            print "error!"
             continue
         # 增加redis 中判题队列长度的计数器
         r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"])

From f1684323f23a85915ce2c6f2ad5dd52c5fc21091 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 09:47:55 +0800
Subject: [PATCH 15/38] =?UTF-8?q?Accessories:=E7=BC=96=E7=A0=81=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E8=BF=9E=E6=B3=A8=E9=87=8A=E9=87=8C=E6=9C=89=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E9=83=BD=E4=B8=8D=E8=A1=8C[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/reJudge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Accessories/reJudge.py b/Accessories/reJudge.py
index 62f8ef8..dc1ad2e 100644
--- a/Accessories/reJudge.py
+++ b/Accessories/reJudge.py
@@ -66,7 +66,7 @@ def easy_rejudge(submissions, map_table, user_id, contest_id=None):
         except Exception:
             print "error!"
             continue
-        # 增加redis 中判题队列长度的计数器
+            
         r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"])
         r.incr("judge_queue_length")
 

From 3f570f0b336958dfcf9c95d2d39e3a4339f78790 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 14:55:56 +0800
Subject: [PATCH 16/38] =?UTF-8?q?update=20utils.py=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E6=8A=8A=E6=AF=94=E8=B5=9B=E9=A2=98=E7=9B=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=B0=E5=89=8D=E5=8F=B0=E9=A2=98=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E8=84=9A=E6=9C=AC=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/Accessories/utils.py b/Accessories/utils.py
index 264bd55..36551bb 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -1,6 +1,6 @@
 import django
 from contest.models import *
-
+from problem.models import *
 django.setup()
 
 
@@ -27,3 +27,39 @@ def add_exist_problem_to_contest(problems, contest_id):
                               memory_limit=problem.memory_limit)
         i += 1
     return
+
+def add_contest_problem_to_problem(contest_id):
+    try:
+        contest = Contest.objects.get(pk=contest_id)
+    except Contest.DoesNotExist:
+        print "Contest Doesn't Exist!"
+        return
+    #Get all problems in this contest
+    problems = ContestProblem.objects.filter(contest=contest)
+    
+    #get a tag
+    try:
+        tag = ProblemTag.objects.get(name=contest.title)
+    except ProblemTag.DoesNotExist:
+        tag = ProblemTag.objects.create(name=tag)
+        
+    #for each problem
+    for problem in problems:
+        print "Add problem to problem list:"
+        print problem.title
+        p = Problem(title=problem.title, 
+                              description=problem.description,
+                              input_description=problem.input_description,
+                              output_description=problem.output_description,
+                              samples=problem.samples,
+                              test_case_id=problem.test_case_id,
+                              hint=problem.hint,
+                              created_by=problem.created_by,
+                              time_limit=problem.time_limit,
+                              memory_limit=problem.memory_limit,
+                              visible = False,
+                              difficulty = 0,
+                              source = contest.title)
+        p.tags.add(tag)
+        p.save()
+    return
\ No newline at end of file

From 8f39e33d279b59bd1f880dad20ff7a8378d801b9 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 15:21:59 +0800
Subject: [PATCH 17/38] =?UTF-8?q?update=20utils.py=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=9A=E6=89=8D=E6=8F=90=E4=BA=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Accessories/utils.py b/Accessories/utils.py
index 36551bb..e67f550 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -41,13 +41,13 @@ def add_contest_problem_to_problem(contest_id):
     try:
         tag = ProblemTag.objects.get(name=contest.title)
     except ProblemTag.DoesNotExist:
-        tag = ProblemTag.objects.create(name=tag)
+        tag = ProblemTag.objects.create(name=contest.title)
         
     #for each problem
     for problem in problems:
         print "Add problem to problem list:"
         print problem.title
-        p = Problem(title=problem.title, 
+        p = Problem.objects.create(title=problem.title, 
                               description=problem.description,
                               input_description=problem.input_description,
                               output_description=problem.output_description,
@@ -61,5 +61,4 @@ def add_contest_problem_to_problem(contest_id):
                               difficulty = 0,
                               source = contest.title)
         p.tags.add(tag)
-        p.save()
     return
\ No newline at end of file

From 6dc0c43dccb506a7537273f2f29e31840bab1e8f Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 15:34:07 +0800
Subject: [PATCH 18/38] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=8C=89=E7=85=A7=E6=A0=87=E7=AD=BE=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=B0=86=E4=BC=9A=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 problem/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/problem/views.py b/problem/views.py
index b73085f..9f65932 100644
--- a/problem/views.py
+++ b/problem/views.py
@@ -235,7 +235,7 @@ def problem_list_page(request, page=1):
             tag = ProblemTag.objects.get(name=tag_text)
         except ProblemTag.DoesNotExist:
             return error_page(request, u"标签不存在")
-        problems = tag.problem_set.all()
+        problems = tag.problem_set.all().filter(visible=True)
 
     paginator = Paginator(problems, 20)
     try:

From 2fc43e3aacefa6ef062303739c1fe1c88cb778a0 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Mon, 7 Sep 2015 10:39:45 +0800
Subject: [PATCH 19/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AE=BD?=
 =?UTF-8?q?=E6=9D=BE=E5=88=A4=E9=A2=98=E6=A8=A1=E5=BC=8F=E4=B8=AD=E5=AF=B9?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E7=9A=84=E5=A4=84=E7=90=86,=E5=90=A6?=
 =?UTF-8?q?=E5=88=99=E8=B6=85=E6=97=B6=E5=B0=86=E8=A2=AB=E5=88=A4=E4=B8=BA?=
 =?UTF-8?q?runTimeError[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 judge/judger/loose_client.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/judge/judger/loose_client.py b/judge/judger/loose_client.py
index 203bad0..db85ecc 100644
--- a/judge/judger/loose_client.py
+++ b/judge/judger/loose_client.py
@@ -134,11 +134,6 @@ class JudgeClient(object):
 
         run_result["test_case_id"] = test_case_id
 
-        # 如果返回值非0 或者信号量不是0 或者程序的stderr有输出 代表非正常结束
-        if run_result["exit_code"] or run_result["term_sig"] or run_result["siginaled"] or error:
-            run_result["result"] = result["runtime_error"]
-            return run_result
-
         # 代表内存或者时间超过限制了
         if run_result["exceed"]:
             if run_result["exceed"] == "memory":
@@ -149,6 +144,11 @@ class JudgeClient(object):
                 raise JudgeClientError("Error exceeded type: " + run_result["exceed"])
             return run_result
 
+        # 如果返回值非0 或者信号量不是0 或者程序的stderr有输出 代表非正常结束
+        if run_result["exit_code"] or run_result["term_sig"] or run_result["siginaled"] or error:
+            run_result["result"] = result["runtime_error"]
+            return run_result
+
         # 下面就是代码正常运行了 需要判断代码的输出是否正确
         if self._compare_output(test_case_id):
             run_result["result"] = result["accepted"]

From 71d7a34e340d331349d52490d5b551dc89dc829c Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Mon, 7 Sep 2015 10:51:47 +0800
Subject: [PATCH 20/38] =?UTF-8?q?=E5=85=B6=E5=AE=9E=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9,=E8=B7=9Forigin=20dev-sxw=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4,=E5=9B=A0=E4=B8=BA=E5=88=9A=E5=88=9Agit=20pu?=
 =?UTF-8?q?ll=E7=9A=84=E6=97=B6=E5=80=99=E5=87=BA=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 38 +++++++++++++++++++++++++++++++++++---
 problem/views.py     |  2 +-
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Accessories/utils.py b/Accessories/utils.py
index 264bd55..17ab096 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -1,9 +1,7 @@
 import django
 from contest.models import *
-
+from problem.models import *
 django.setup()
-
-
 def add_exist_problem_to_contest(problems, contest_id):
     try:
         contest = Contest.objects.get(pk=contest_id)
@@ -27,3 +25,37 @@ def add_exist_problem_to_contest(problems, contest_id):
                               memory_limit=problem.memory_limit)
         i += 1
     return
+def add_contest_problem_to_problem(contest_id):
+    try:
+        contest = Contest.objects.get(pk=contest_id)
+    except Contest.DoesNotExist:
+        print "Contest Doesn't Exist!"
+        return
+    #Get all problems in this contest
+    problems = ContestProblem.objects.filter(contest=contest)
+    
+    #get a tag
+    try:
+        tag = ProblemTag.objects.get(name=contest.title)
+    except ProblemTag.DoesNotExist:
+        tag = ProblemTag.objects.create(name=contest.title)
+        
+    #for each problem
+    for problem in problems:
+        print "Add problem to problem list:"
+        print problem.title
+        p = Problem.objects.create(title=problem.title, 
+                              description=problem.description,
+                              input_description=problem.input_description,
+                              output_description=problem.output_description,
+                              samples=problem.samples,
+                              test_case_id=problem.test_case_id,
+                              hint=problem.hint,
+                              created_by=problem.created_by,
+                              time_limit=problem.time_limit,
+                              memory_limit=problem.memory_limit,
+                              visible = False,
+                              difficulty = 0,
+                              source = contest.title)
+        p.tags.add(tag)
+    return
\ No newline at end of file
diff --git a/problem/views.py b/problem/views.py
index b73085f..9f65932 100644
--- a/problem/views.py
+++ b/problem/views.py
@@ -235,7 +235,7 @@ def problem_list_page(request, page=1):
             tag = ProblemTag.objects.get(name=tag_text)
         except ProblemTag.DoesNotExist:
             return error_page(request, u"标签不存在")
-        problems = tag.problem_set.all()
+        problems = tag.problem_set.all().filter(visible=True)
 
     paginator = Paginator(problems, 20)
     try:

From 13b7a84c8f295ca2682dfa5e6ef33db9ecbb2043 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 10:35:24 +0800
Subject: [PATCH 21/38] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=98=E7=9B=AE,?=
 =?UTF-8?q?=E6=AF=94=E8=B5=9B=E9=A2=98=E7=9B=AE=E5=88=97=E8=A1=A8=E9=87=8C?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=92=8C=E6=8F=90=E7=A4=BA=E7=9A=84=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=B2=A1=E6=9C=89=E5=8C=85=E8=A3=B9=E5=9C=A8=20proble?=
 =?UTF-8?q?m-detail=E9=87=8C=E7=9A=84=E9=97=AE=E9=A2=98,=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E4=B8=8A=E6=BA=90=E4=BB=A3=E7=A0=81=E9=87=8C=E4=BB=96=E4=BB=AC?=
 =?UTF-8?q?=E8=A2=AB=E5=8C=85=E8=A3=B9=E5=9C=A8<p=20clas=20s=3D'problem-de?=
 =?UTF-8?q?tail'>=E9=87=8C=E4=BD=86=E6=98=AF=E5=AE=9E=E9=99=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E5=8D=B4=E6=98=AF=E5=9C=A8=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8,=E4=B8=8D=E7=90=86=E8=A7=A3.=E6=8A=8Ap?=
 =?UTF-8?q?=E6=94=B9=E6=88=90div=E5=B0=B1=E5=A5=BD=E4=BA=86~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/oj/contest/contest_problem.html | 4 ++--
 template/src/oj/problem/problem.html         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/template/src/oj/contest/contest_problem.html b/template/src/oj/contest/contest_problem.html
index 4cf7e3b..a42b8ad 100644
--- a/template/src/oj/contest/contest_problem.html
+++ b/template/src/oj/contest/contest_problem.html
@@ -23,7 +23,7 @@
     <div class="problem-section">
         <label class="problem-label">描述</label>
 
-        <p class="problem-detail">{{ contest_problem.description|safe }}</p>
+        <div class="problem-detail">{{ contest_problem.description|safe }}</div>
     </div>
     <div class="problem-section">
         <label class="problem-label">输入</label>
@@ -62,7 +62,7 @@
                 <div class="problem-section hide">
                     <label class="problem-label">提示</label>
 
-                    <p class="problem-detail">{{ contest_problem.hint|safe }}</p>
+                    <div class="problem-detail">{{ contest_problem.hint|safe }}</div>
                 </div>
             {% endif %}
 
diff --git a/template/src/oj/problem/problem.html b/template/src/oj/problem/problem.html
index 2efd86a..00b4ce7 100644
--- a/template/src/oj/problem/problem.html
+++ b/template/src/oj/problem/problem.html
@@ -13,7 +13,7 @@
             <div class="problem-section">
                 <label class="problem-label">描述</label>
 
-                <p class="problem-detail">{{ problem.description|safe }}</p>
+                <div class="problem-detail">{{ problem.description|safe }}</div>
             </div>
             <div class="problem-section">
                 <label class="problem-label">输入</label>
@@ -46,7 +46,7 @@
                 <div class="problem-section hide">
                     <label class="problem-label">提示</label>
 
-                    <p class="problem-detail">{{ problem.hint|safe }}</p>
+                    <div class="problem-detail">{{ problem.hint|safe }}</div>
                 </div>
             {% endif %}
             <div class="problem-section hide">

From e219ff890d25a4798a21e6a481f69384ab379e89 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 11:03:59 +0800
Subject: [PATCH 22/38] =?UTF-8?q?=E5=90=88=E5=B9=B6dev,=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=9C=A8=E5=89=8D=E5=8F=B0=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E6=AF=94=E8=B5=9B=E6=89=80=E6=9C=89=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85,=E4=BF=AE=E6=94=B9=E6=8E=AA=E8=BE=9E,?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E5=BD=A2=E5=BC=8F,?=
 =?UTF-8?q?=E4=BB=A5=E4=BE=BF=E4=BA=8E=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=E7=9A=84=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                    |  16 +-
 account/tests.py                              |   2 +-
 contest/test_urls.py                          |   9 +
 contest/tests.py                              | 183 +++++++++++++++++-
 contest/views.py                              |   3 -
 contest_submission/tests.py                   |  91 ++++++++-
 contest_submission/views.py                   |  46 +++--
 judge/Dockerfile                              |  19 ++
 judge/judger_controller/settings.py           |  11 +-
 oj/daocloud_settings.py                       |  19 --
 oj/local_settings.py                          |   6 +-
 oj/server_settings.py                         |   4 +-
 oj/settings.py                                |   4 -
 problem/serizalizers.py                       |   8 +-
 problem/tests.py                              |  14 ++
 requirements.txt                              |   3 +-
 static/release/fis-conf.js                    |  10 +
 static/src/js/app/admin/problem/addProblem.js |   4 -
 static/src/js/app/oj/problem/problem.js       |   2 +-
 static/src/js/build.js                        |  11 +-
 submission/tests.py                           |  81 ++++++--
 submission/views.py                           |   2 +-
 .../src/oj/contest/my_submissions_list.html   |  14 +-
 template/src/oj/contest/submissions_list.html |  72 +++++--
 .../oj/contest/submissions_list_admin.html    |  78 ++++++++
 template/src/oj/problem/problem.html          |  20 +-
 .../oj/submission/my_submissions_list.html    |  12 +-
 template/src/oj_base.html                     |   4 +-
 utils/templatetags/problem.py                 |   2 +-
 29 files changed, 610 insertions(+), 140 deletions(-)
 create mode 100644 contest/test_urls.py
 create mode 100644 judge/Dockerfile
 delete mode 100644 oj/daocloud_settings.py
 create mode 100644 template/src/oj/contest/submissions_list_admin.html

diff --git a/Dockerfile b/Dockerfile
index f10b84c..2e10830 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,7 @@
 FROM python:2.7
-ENV PYTHONUNBUFFERED 1
-ENV oj_env daocloud
-RUN mkdir /var/oj
-COPY . /var/oj/
-WORKDIR /var/oj/
+ENV PYTHONBUFFERED 1
+RUN mkdir -p /code/log /code/test_case
+WORKDIR /code
+ADD requirements.txt /code/
 RUN pip install -r requirements.txt
-EXPOSE 8080
-RUN mkdir LOG
-RUN mkdir test_case
-RUN mkdir tmp
-RUN python manage.py migrate
-CMD python manage.py runserver 0.0.0.0:8080
+EXPOSE 8010
\ No newline at end of file
diff --git a/account/tests.py b/account/tests.py
index e868f62..d0adf8a 100644
--- a/account/tests.py
+++ b/account/tests.py
@@ -370,7 +370,7 @@ class UserLogoutTest(TestCase):
         user.set_password("1")
         user.save()
 
-    def logout_success(self):
+    def test_logout_success(self):
         self.client = Client()
         self.client.login(username="test", password="1")
         response = self.client.get("/logout/")
diff --git a/contest/test_urls.py b/contest/test_urls.py
new file mode 100644
index 0000000..234c600
--- /dev/null
+++ b/contest/test_urls.py
@@ -0,0 +1,9 @@
+# coding=utf-8
+from django.conf.urls import include, url
+from django.views.generic import TemplateView
+
+
+urlpatterns = [
+
+    url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"),
+]
diff --git a/contest/tests.py b/contest/tests.py
index adbf00b..626a3ab 100644
--- a/contest/tests.py
+++ b/contest/tests.py
@@ -1,15 +1,18 @@
 # coding=utf-8
 import json
 from django.core.urlresolvers import reverse
-from django.test import TestCase
+from django.test import TestCase, Client
+from django.http import HttpResponse
 
 from rest_framework.test import APITestCase, APIClient
 
 from account.models import User
 from group.models import Group
 from contest.models import Contest, ContestProblem
+from .models import ContestSubmission
 from announcement.models import Announcement
 from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN
+from decorators import check_user_contest_permission
 
 
 class ContestAdminAPITest(APITestCase):
@@ -398,3 +401,181 @@ class ContestProblemAdminAPItEST(APITestCase):
         response = self.client.put(self.url, data=data)
         self.assertEqual(response.data["code"], 1)
 
+
+class ContestPasswordVerifyAPITest(APITestCase):
+    def setUp(self):
+        self.client = APIClient()
+        self.url = reverse('contest_password_verify_api')
+        self.user = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user.set_password("testaa")
+        self.user.save()
+        self.user2 = User.objects.create(username="test2", admin_type=ADMIN)
+        self.user2.set_password("testbb")
+        self.user2.save()
+        self.client.login(username="test1", password="testaa")
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=2, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-15T12:00:00.000Z",
+                                                     password="aacc", created_by=User.objects.get(username="test1"))
+
+    def test_invalid_format(self):
+        self.client.login(username="test2", password="testbb")
+        data = {"contest_id": self.global_contest.id}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data["code"], 1)
+
+    def test_contest_does_not_exist(self):
+        self.client.login(username="test2", password="testbb")
+        data = {"contest_id": self.global_contest.id + 1, "password": "aacc"}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data, {"code": 1, "data": u"比赛不存在"})
+
+    def test_contest_password_verify_unsuccessfully(self):
+        self.client.login(username="test2", password="testbb")
+        data = {"contest_id": self.global_contest.id, "password": "aabb"}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data, {"code": 1, "data": u"密码错误"})
+
+    def test_contest_password_verify_successfully(self):
+        self.client.login(username="test2", password="testbb")
+        data = {"contest_id": self.global_contest.id, "password": "aacc"}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data["code"], 0)
+
+
+class ContestPageTest(TestCase):
+    # 单个比赛详情页的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.client.login(username="test1", password="testaa")
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=2, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-15T12:00:00.000Z",
+                                                     password="aacc", created_by=User.objects.get(username="test1"))
+
+    def test_visit_contest_page_successfully(self):
+        response = self.client.get('/contest/1/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_visit_contest_page_unsuccessfully(self):
+        response = self.client.get('/contest/10/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
+
+class ContestProblemPageTest(TestCase):
+    # 单个比赛题目详情页的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.client.login(username="test1", password="testaa")
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=2, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-15T12:00:00.000Z",
+                                                     password="aacc", created_by=User.objects.get(username="test1"))
+        self.contest_problem = ContestProblem.objects.create(title="titlex",
+                                                             description="descriptionx",
+                                                             input_description="input1_description",
+                                                             output_description="output1_description",
+                                                             test_case_id="1",
+                                                             samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                                             time_limit=100,
+                                                             memory_limit=1000,
+                                                             hint="hint1",
+                                                             created_by=User.objects.get(username="test1"),
+                                                             contest=Contest.objects.get(title="titlex"),
+                                                             sort_index="a")
+
+    def test_visit_contest_problem_page_successfully(self):
+        response = self.client.get('/contest/1/problem/1/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_visit_contest_page_unsuccessfully(self):
+        response = self.client.get('/contest/10/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
+    def test_visit_contest_submissions_page_successfully(self):
+        ContestSubmission.objects.create(user=self.user1,
+                                         contest=self.global_contest,
+                                         problem=self.contest_problem,
+                                         ac=True)
+        response = self.client.get('/contest/1/problem/1/submissions/')
+        self.assertEqual(response.status_code, 200)
+
+
+class ContestProblemListPageTest(TestCase):
+    # 比赛题目列表的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.client.login(username="test1", password="testaa")
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=2, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-15T12:00:00.000Z",
+                                                     password="aacc", created_by=User.objects.get(username="test1"))
+        self.contest_problem = ContestProblem.objects.create(title="titlex",
+                                                             description="descriptionx",
+                                                             input_description="input1_description",
+                                                             output_description="output1_description",
+                                                             test_case_id="1",
+                                                             samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                                             time_limit=100,
+                                                             memory_limit=1000,
+                                                             hint="hint1",
+                                                             created_by=User.objects.get(username="test1"),
+                                                             contest=Contest.objects.get(title="titlex"),
+                                                             sort_index="a")
+
+    def test_visit_contest_problem_list_page_successfully(self):
+        response = self.client.get('/contest/1/problems/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_visit_contest_problem_page_unsuccessfully(self):
+        response = self.client.get('/contest/1/problem/100/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
+
+class ContestListPageTest(TestCase):
+    # 以下是所有比赛列表页的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.url = reverse('contest_list_page')
+        self.client.login(username="test1", password="testaa")
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=2, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-15T12:00:00.000Z",
+                                                     password="aacc", created_by=User.objects.get(username="test1"))
+
+    def test_visit_contest_list_page_successfully(self):
+        response = self.client.get('/contests/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_visit_contest_list_page_unsuccessfully(self):
+        response = self.client.get('/contests/2/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
+    def test_query_by_keyword(self):
+        response = self.client.get(self.url + "?keyword=title1")
+        self.assertEqual(response.status_code, 200)
+
+    def test_query_by_join_successfully(self):
+        response = self.client.get(self.url + "?join=True")
+        self.assertEqual(response.status_code, 200)
+
+
+
+
diff --git a/contest/views.py b/contest/views.py
index 2c03f75..39d0f0f 100644
--- a/contest/views.py
+++ b/contest/views.py
@@ -320,7 +320,6 @@ def contest_problems_list_page(request, contest_id):
         contest = Contest.objects.get(id=contest_id)
     except Contest.DoesNotExist:
         return error_page(request, u"比赛不存在")
-
     contest_problems = ContestProblem.objects.filter(contest=contest).order_by("sort_index")
     submissions = ContestSubmission.objects.filter(user=request.user, contest=contest)
     state = {}
@@ -334,10 +333,8 @@ def contest_problems_list_page(request, contest_id):
                 item.state = 2
         else:
             item.state = 0
-
     # 右侧的公告列表
     announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time")
-
     return render(request, "oj/contest/contest_problems_list.html", {"contest_problems": contest_problems,
                                                                      "announcements": announcements,
                                                                      "contest": {"id": contest_id}})
diff --git a/contest_submission/tests.py b/contest_submission/tests.py
index b1eace1..975d11c 100644
--- a/contest_submission/tests.py
+++ b/contest_submission/tests.py
@@ -1,14 +1,97 @@
+# coding=utf-8
 import json
-
+from django.test import TestCase, Client
 from django.core.urlresolvers import reverse
-from account.models import User, ADMIN, SUPER_ADMIN
-
+from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN
+from problem.models import Problem
 from contest.models import Contest, ContestProblem
 from submission.models import Submission
 from rest_framework.test import APITestCase, APIClient
 
 
-# Create your tests here.
+class ContestSubmissionAPITest(APITestCase):
+    def setUp(self):
+        self.client = APIClient()
+        self.url = reverse('contest_submission_api')
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER)
+        self.user2.set_password("testbb")
+        self.user2.save()
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=1, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-30T12:00:00.000Z",
+                                                     created_by=User.objects.get(username="test1"))
+        self.contest_problem = ContestProblem.objects.create(title="titlex",
+                                                             description="descriptionx",
+                                                             input_description="input1_description",
+                                                             output_description="output1_description",
+                                                             test_case_id="1",
+                                                             samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                                             time_limit=100,
+                                                             memory_limit=1000,
+                                                             hint="hint1",
+                                                             created_by=User.objects.get(username="test1"),
+                                                             contest=Contest.objects.get(title="titlex"),
+                                                             sort_index="a")
+
+    # 以下是创建比赛的提交
+    def test_invalid_format(self):
+        self.client.login(username="test1", password="testaa")
+        data = {"contest_id": self.global_contest.id, "language": 1}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data["code"], 1)
+
+    def test_contest_submission_successfully(self):
+        self.client.login(username="test1", password="testaa")
+        data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id,
+                "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data["code"], 0)
+
+    def test_contest_problem_does_not_exist(self):
+        self.client.login(username="test1", password="testaa")
+        data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id + 10,
+                "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'}
+        response = self.client.post(self.url, data=data)
+        self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"})
+
+
+class ContestProblemMySubmissionListTest(TestCase):
+    # 以下是我比赛单个题目的提交列表的测试
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER)
+        self.user2.set_password("testbb")
+        self.user2.save()
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=1, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-30T12:00:00.000Z",
+                                                     created_by=User.objects.get(username="test1"))
+        self.contest_problem = ContestProblem.objects.create(title="titlex",
+                                                             description="descriptionx",
+                                                             input_description="input1_description",
+                                                             output_description="output1_description",
+                                                             test_case_id="1",
+                                                             samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                                             time_limit=100,
+                                                             memory_limit=1000,
+                                                             hint="hint1",
+                                                             created_by=self.user1,
+                                                             contest=self.global_contest,
+                                                             sort_index="a")
+
+    def test_contestsList_page_not_exist(self):
+        self.client.login(username="test1", password="testaa")
+        response = self.client.get('/contest/1/submissions/999/')
+        self.assertTemplateUsed(response, "utils/error.html")
+
 
 class SubmissionAPITest(APITestCase):
     def setUp(self):
diff --git a/contest_submission/views.py b/contest_submission/views.py
index 003ad8a..538d03b 100644
--- a/contest_submission/views.py
+++ b/contest_submission/views.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 import json
-
 import redis
 from django.shortcuts import render
 from django.core.paginator import Paginator
@@ -9,16 +8,15 @@ from rest_framework.views import APIView
 
 from judge.judger_controller.tasks import judge
 from judge.judger_controller.settings import redis_config
+
 from account.decorators import login_required
 from account.models import SUPER_ADMIN
 
 from contest.decorators import check_user_contest_permission
-
 from problem.models import Problem
 from contest.models import Contest, ContestProblem
 
 from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate
-
 from submission.models import Submission
 from .serializers import CreateContestSubmissionSerializer
 from submission.serializers import SubmissionSerializer
@@ -35,31 +33,24 @@ class ContestSubmissionAPIView(APIView):
         serializer = CreateContestSubmissionSerializer(data=request.data)
         if serializer.is_valid():
             data = serializer.data
-            try:
-                contest = Contest.objects.get(id=data["contest_id"])
-            except Contest.DoesNotExist:
-                return error_response(u"比赛不存在")
+            contest = Contest.objects.get(id=data["contest_id"])
             try:
                 problem = ContestProblem.objects.get(contest=contest, id=data["problem_id"])
                 # 更新题目提交计数器
                 problem.total_submit_number += 1
                 problem.save()
-            except Problem.DoesNotExist:
+            except ContestProblem.DoesNotExist:
                 return error_response(u"题目不存在")
-
             submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]),
                                                    contest_id=contest.id, code=data["code"], problem_id=problem.id)
             try:
                 judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id)
             except Exception:
                 return error_response(u"提交判题任务失败")
-
             # 增加redis 中判题队列长度的计数器
             r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"])
             r.incr("judge_queue_length")
-
             return success_response({"submission_id": submission.id})
-
         else:
             return serializer_invalid_response(serializer)
 
@@ -75,7 +66,7 @@ def contest_problem_my_submissions_list_page(request, contest_id, contest_proble
         return error_page(request, u"比赛不存在")
     try:
         contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True)
-    except Problem.DoesNotExist:
+    except ContestProblem.DoesNotExist:
         return error_page(request, u"比赛问题不存在")
     submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id).order_by(
         "-create_time"). \
@@ -95,8 +86,26 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
         return error_page(request, u"比赛不存在")
     # 以下是本场比赛中所有的提交
     submissions = Submission.objects.filter(contest_id=contest_id). \
-        values("id", "result", "create_time", "accepted_answer_time", "language", "user_id").order_by("-create_time")
+        values("id", "contest_id", "problem_id", "result", "create_time", "accepted_answer_time", "language", "user_id").order_by("-create_time")
+    language = request.GET.get("language", None)
+    filter = None
+    if language:
+        submissions = submissions.filter(language=int(language))
+        filter = {"name": "language", "content": language}
+    result = request.GET.get("result", None)
+    if result:
+        submissions = submissions.filter(result=int(result))
+        filter = {"name": "result", "content": result}
     paginator = Paginator(submissions, 20)
+
+    # 为查询题目标题创建新字典
+    title = {}
+    contest_problems = ContestProblem.objects.filter(contest=contest)
+    for item in contest_problems:
+        title[item.id] = item.title
+    for item in submissions:
+        item['title'] = title[item['problem_id']]
+
     try:
         current_page = paginator.page(int(page))
     except Exception:
@@ -111,10 +120,16 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
     except Exception:
         pass
 
+    # 如果该用户是超级管理员那么他可以查看所有的提交记录详情
+    if request.user.admin_type > 1:
+        return render(request, "oj/contest/submissions_list_admin.html",
+                      {"submissions": current_page, "page": int(page),
+                       "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,
+                       "contest": contest})
     return render(request, "oj/contest/submissions_list.html",
                   {"submissions": current_page, "page": int(page),
                    "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,
-                   "contest": contest})
+                   "contest": contest, "filter":filter})
 
 
 class ContestSubmissionAdminAPIView(APIView):
@@ -147,5 +162,4 @@ class ContestSubmissionAdminAPIView(APIView):
                 return error_response(u"参数错误!")
         if problem_id:
             submissions = submissions.filter(problem_id=problem_id)
-
         return paginate(request, submissions, SubmissionSerializer)
diff --git a/judge/Dockerfile b/judge/Dockerfile
new file mode 100644
index 0000000..c2ca1b1
--- /dev/null
+++ b/judge/Dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:14.04
+MAINTAINER virusdefender<qduliyang@outlook.com>
+RUN mkdir /var/install/
+WORKDIR /var/install/
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update
+RUN apt-get -y install software-properties-common python-software-properties
+RUN add-apt-repository -y ppa:webupd8team/java
+RUN apt-get update
+RUN apt-get -y install python gcc g++ rake pkg-config git make autoconf automake libtool python-pip python2.7-mysqldb
+RUN echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections
+RUN echo debconf shared/accepted-oracle-license-v1-1 seen true | sudo debconf-set-selections
+RUN apt-get install -y oracle-java7-installer
+RUN apt-get -y install libseccomp-dev
+RUN git clone https://github.com/quark-zju/lrun.git
+RUN cd lrun && make install
+RUN mkdir -p /var/judger/run/ && mkdir /var/judger/test_case/ && mkdir /var/judger/code/
+RUN chmod -R 777 /var/judger/run/
+WORKDIR /var/judger/code/
\ No newline at end of file
diff --git a/judge/judger_controller/settings.py b/judge/judger_controller/settings.py
index a0d3e66..aff08b1 100644
--- a/judge/judger_controller/settings.py
+++ b/judge/judger_controller/settings.py
@@ -1,4 +1,5 @@
 # coding=utf-8
+# 这个redis 是 celery 使用的，包括存储队列信息还有部分统计信息
 redis_config = {
     "host": "121.42.32.129",
     "port": 6379,
@@ -6,17 +7,21 @@ redis_config = {
 }
 
 
+# 判题的 docker 容器的配置参数
 docker_config = {
-    "image_name": " a7673b55d263",
+    "image_name": "3da0e526934e",
     "docker_path": "docker",
     "shell": True
 }
 
 
-test_case_dir = "/root/test_case/"
-source_code_dir = "/root/"
+# 测试用例的路径，是主机上的实际路径
+test_case_dir = "/var/mnt/source/test_case/"
+# 源代码路径，也就是 manage.py 所在的实际路径
+source_code_dir = "/var/mnt/source/OnlineJudge/"
 
 
+# 存储提交信息的数据库，是 celery 使用的，与 oj.settings/local_settings 等区分，那是 web 服务器访问的地址
 submission_db = {
     "host": "127.0.0.1",
     "port": 3306,
diff --git a/oj/daocloud_settings.py b/oj/daocloud_settings.py
deleted file mode 100644
index a99e009..0000000
--- a/oj/daocloud_settings.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# coding=utf-8
-import os
-
-LOG_PATH = "LOG/"
-
-# Database
-# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-        'CONN_MAX_AGE': 1,
-    }
-}
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
\ No newline at end of file
diff --git a/oj/local_settings.py b/oj/local_settings.py
index 0b7f642..b923291 100644
--- a/oj/local_settings.py
+++ b/oj/local_settings.py
@@ -12,15 +12,16 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-        'CONN_MAX_AGE': 0.3,
     },
+    # submission 的 name 和 engine 请勿修改，其他代码会用到
     'submission': {
         'NAME': 'oj_submission',
         'ENGINE': 'django.db.backends.mysql',
         'HOST': "121.42.32.129",
         'PORT': 3306,
         'USER': 'root',
-        'PASSWORD': 'mypwd'
+        'PASSWORD': 'mypwd',
+        'CONN_MAX_AGE': 0.1,
     }
 }
 
@@ -30,4 +31,3 @@ DEBUG = True
 TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
 
 ALLOWED_HOSTS = []
-
diff --git a/oj/server_settings.py b/oj/server_settings.py
index badfef6..185bf6b 100644
--- a/oj/server_settings.py
+++ b/oj/server_settings.py
@@ -12,7 +12,7 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': "oj",
-        'CONN_MAX_AGE': 0.3,
+        'CONN_MAX_AGE': 0.1,
         'HOST': '127.0.0.1',
         'PORT': 3306,
         'USER': 'root',
@@ -21,6 +21,7 @@ DATABASES = {
     'submission': {
         'NAME': 'oj_submission',
         'ENGINE': 'django.db.backends.mysql',
+        'CONN_MAX_AGE': 0.1,
         'HOST': "127.0.0.1",
         'PORT': 3306,
         'USER': 'root',
@@ -34,4 +35,3 @@ DEBUG = True
 TEST_CASE_DIR = '/root/test_case/'
 
 ALLOWED_HOSTS = ['*']
-
diff --git a/oj/settings.py b/oj/settings.py
index 376060f..097a4c2 100644
--- a/oj/settings.py
+++ b/oj/settings.py
@@ -113,10 +113,6 @@ STATIC_URL = '/static/'
 
 STATICFILES_DIRS = (os.path.join(BASE_DIR, "static/src/"),)
 
-TEMPLATE_DIRS = (
-    os.path.join(BASE_DIR, "template/src"),
-)
-
 AUTH_USER_MODEL = 'account.User'
 
 LOGGING = {
diff --git a/problem/serizalizers.py b/problem/serizalizers.py
index 1fb61cc..f9c5caa 100644
--- a/problem/serizalizers.py
+++ b/problem/serizalizers.py
@@ -26,8 +26,8 @@ class CreateProblemSerializer(serializers.Serializer):
     samples = ProblemSampleSerializer()
     test_case_id = serializers.CharField(max_length=40)
     source = serializers.CharField(max_length=30, required=False, default=None)
-    time_limit = serializers.IntegerField()
-    memory_limit = serializers.IntegerField()
+    time_limit = serializers.IntegerField(min_value=1)
+    memory_limit = serializers.IntegerField(min_value=1)
     difficulty = serializers.IntegerField()
     tags = serializers.ListField(child=serializers.CharField(max_length=10))
     hint = serializers.CharField(max_length=3000, allow_blank=True)
@@ -61,8 +61,8 @@ class EditProblemSerializer(serializers.Serializer):
     output_description = serializers.CharField(max_length=10000)
     test_case_id = serializers.CharField(max_length=40)
     source = serializers.CharField(max_length=30)
-    time_limit = serializers.IntegerField()
-    memory_limit = serializers.IntegerField()
+    time_limit = serializers.IntegerField(min_value=1)
+    memory_limit = serializers.IntegerField(min_value=1)
     difficulty = serializers.IntegerField()
     tags = serializers.ListField(child=serializers.CharField(max_length=20))
     samples = ProblemSampleSerializer()
diff --git a/problem/tests.py b/problem/tests.py
index 2a7aecc..9819486 100644
--- a/problem/tests.py
+++ b/problem/tests.py
@@ -187,5 +187,19 @@ class ProblemListPageTest(TestCase):
                                               hint="hint1",
                                               created_by=User.objects.get(username="test"))
 
+    def test_problemListPage_not_exist(self):
+        response = self.client.get('/problems/999/')
+        self.assertTemplateUsed(response, "utils/error.html")
 
+    def test_query_by_keyword(self):
+        response = self.client.get(self.url + "?keyword=title1")
+        self.assertEqual(response.status_code, 200)
+
+    def test_query_by_tag_successfully(self):
+        response = self.client.get(self.url + "?tag=")
+        self.assertEqual(response.status_code, 200)
+
+    def test_tag_does_not_exists(self):
+        response = self.client.get(self.url + "?tag=xxxxxx")
+        self.assertTemplateUsed(response, "utils/error.html")
 
diff --git a/requirements.txt b/requirements.txt
index 9ad8f3f..3a706b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,4 +7,5 @@ django-rest-swagger
 celery
 gunicorn
 coverage
-django-extensions
\ No newline at end of file
+django-extensions
+supervisor
\ No newline at end of file
diff --git a/static/release/fis-conf.js b/static/release/fis-conf.js
index ce128cd..f0935c3 100644
--- a/static/release/fis-conf.js
+++ b/static/release/fis-conf.js
@@ -1,3 +1,13 @@
 /**
  * Created by virusdefender on 8/25/15.
  */
+
+fis.match('*.{js,css,png,gif}', {
+    useHash: true // 开启 md5 戳
+});
+
+fis.config.set(
+'roadmap.path',
+[{reg:'*.html',isHtmlLike : true}
+])
+;
\ No newline at end of file
diff --git a/static/src/js/app/admin/problem/addProblem.js b/static/src/js/app/admin/problem/addProblem.js
index d34cd9a..c6e49ca 100644
--- a/static/src/js/app/admin/problem/addProblem.js
+++ b/static/src/js/app/admin/problem/addProblem.js
@@ -13,10 +13,6 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                             bsAlert("题目描述不能为空!");
                             return false;
                         }
-                        if (vm.timeLimit < 1000 || vm.timeLimit > 5000) {
-                            bsAlert("保证时间限制是一个1000-5000的合法整数");
-                            return false;
-                        }
                         if (vm.samples.length == 0) {
                             bsAlert("请至少添加一组样例!");
                             return false;
diff --git a/static/src/js/app/oj/problem/problem.js b/static/src/js/app/oj/problem/problem.js
index d936e0f..1faeb6d 100644
--- a/static/src/js/app/oj/problem/problem.js
+++ b/static/src/js/app/oj/problem/problem.js
@@ -48,7 +48,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
         if (!data.result) {
             html += "CPU time: " + data.accepted_answer_time + "ms &nbsp;&nbsp;";
         }
-        html += ('<a href="/my_submission/' + submissionId + '/" target="_blank">查看详情</a></div> </div>');
+        html += ('<a href="/submission/' + submissionId + '/" target="_blank">查看详情</a></div> </div>');
 
         return html;
     }
diff --git a/static/src/js/build.js b/static/src/js/build.js
index 9927a1b..ddd9bb3 100644
--- a/static/src/js/build.js
+++ b/static/src/js/build.js
@@ -1,8 +1,9 @@
 ({
 	// RequireJS 通过一个相对的路径 baseUrl来加载所有代码。baseUrl通常被设置成data-main属性指定脚本的同级目录。
-	baseUrl: "js/",
+	baseUrl: "/static/js/",
 	// 第三方脚本模块的别名,jquery比libs/jquery-1.11.1.min.js简洁明了；
     paths: {
+
         jquery: "lib/jquery/jquery",
         avalon: "lib/avalon/avalon",
         editor: "utils/editor",
@@ -37,12 +38,12 @@
         webUploader: "lib/webuploader/webuploader",
 
         "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker"
-
     },
     shim: {
-        "bootstrap": {"deps": ['jquery']},
-        "_datetimepicker": {"deps": ["jquery"]},
-        "datetimepicker": {"deps": ["_datetimepicker"]}
+        bootstrap: {deps: ["jquery"]},
+        _datetimePicker: {dep: ["jquery"]},
+        datetimePicker: {deps: ["_datetimePicker"]},
+        validator: ["jquery"]
     },
     findNestedDependencies: true,
     appDir: "../",
diff --git a/submission/tests.py b/submission/tests.py
index 0d374ee..ad3b85a 100644
--- a/submission/tests.py
+++ b/submission/tests.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 import json
-from django.test import TestCase
+from django.test import TestCase, Client
 from django.core.urlresolvers import reverse
 from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN
 from problem.models import Problem
@@ -11,7 +11,7 @@ from rest_framework.test import APITestCase, APIClient
 
 class SubmissionsListPageTest(TestCase):
     def setUp(self):
-        self.client = APIClient()
+        self.client = Client()
         self.user = User.objects.create(username="gogoing", admin_type=REGULAR_USER)
         self.user2 = User.objects.create(username="cool", admin_type=REGULAR_USER)
         self.user2.set_password("666666")
@@ -124,25 +124,78 @@ class SubmissionAPITest(APITestCase):
         response = self.client.get(self.url, data=data)
         self.assertEqual(response.data["code"], 0)
 
+    def test_parameter_error(self):
+        self.client.login(username="test1", password="testaa")
+        response = self.client.get(self.url)
+        self.assertEqual(response.data, {"code": 1, "data": u"参数错误"})
 
-class ContestSubmissionAPITest(APITestCase):
+
+class SubmissionAdminAPITest(APITestCase):
     def setUp(self):
         self.client = APIClient()
-        self.url = reverse('contest_submission_api')
-        self.user1 = User.objects.create(username="test1", admin_type=REGULAR_USER)
-        self.user1.set_password("testaa")
-        self.user1.save()
-        self.user2 = User.objects.create(username="test2", admin_type=SUPER_ADMIN)
-        self.user2.set_password("testbb")
-        self.user2.save()
+        self.url = reverse('submission_admin_api_view')
+        self.user = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user.set_password("testaa")
+        self.user.save()
+        self.client.login(username="test1", password="testaa")
+        self.problem = Problem.objects.create(title="title1",
+                                              description="description1",
+                                              input_description="input1_description",
+                                              output_description="output1_description",
+                                              test_case_id="1",
+                                              source="source1",
+                                              samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                              time_limit=100,
+                                              memory_limit=1000,
+                                              difficulty=1,
+                                              hint="hint1",
+                                              created_by=self.user)
         self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
                                                      contest_type=2, show_rank=True, show_user_submission=True,
                                                      start_time="2015-08-15T10:00:00.000Z",
                                                      end_time="2015-08-15T12:00:00.000Z",
-                                                     password="aacc", created_by=User.objects.get(username="test2"))
+                                                     password="aacc", created_by=self.user)
+
+        self.submission = Submission.objects.create(user_id=self.user.id,
+                                                    language=1,
+                                                    code='#include "stdio.h"\nint main(){\n\treturn 0;\n}',
+                                                    problem_id=self.problem.id)
 
     def test_invalid_format(self):
+        response = self.client.get(self.url)
+        self.assertEqual(response.data, {"code": 1, "data": u"参数错误"})
+
+
+class SubmissionPageTest(TestCase):
+    # 单个题目的提交详情页
+    def setUp(self):
+        self.client = Client()
+        self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
+        self.user1.set_password("testaa")
+        self.user1.save()
+        self.user2 = User.objects.create(username="test2", admin_type=ADMIN)
+        self.user2.set_password("testbb")
+        self.user2.save()
         self.client.login(username="test1", password="testaa")
-        data = {"language": 1}
-        response = self.client.post(self.url, data=data)
-        pass
+        self.problem = Problem.objects.create(title="title1",
+                                              description="description1",
+                                              input_description="input1_description",
+                                              output_description="output1_description",
+                                              test_case_id="1",
+                                              source="source1",
+                                              samples=json.dumps([{"input": "1 1", "output": "2"}]),
+                                              time_limit=100,
+                                              memory_limit=1000,
+                                              difficulty=1,
+                                              hint="hint1",
+                                              created_by=User.objects.get(username="test1"))
+        self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
+                                                     contest_type=2, show_rank=True, show_user_submission=True,
+                                                     start_time="2015-08-15T10:00:00.000Z",
+                                                     end_time="2015-08-15T12:00:00.000Z",
+                                                     password="aacc", created_by=User.objects.get(username="test1"))
+
+        self.submission = Submission.objects.create(user_id=self.user1.id,
+                                                    language=1,
+                                                    code='#include "stdio.h"\nint main(){\n\treturn 0;\n}',
+                                                    problem_id=self.problem.id)
diff --git a/submission/views.py b/submission/views.py
index 0925e13..6180f8e 100644
--- a/submission/views.py
+++ b/submission/views.py
@@ -139,7 +139,7 @@ def my_submission_list_page(request, page=1):
     我的所有提交的列表页
     """
     submissions = Submission.objects.filter(user_id=request.user.id, contest_id__isnull=True). \
-        values("id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time")
+        values("id", "problem_id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time")
     language = request.GET.get("language", None)
     filter = None
     if language:
diff --git a/template/src/oj/contest/my_submissions_list.html b/template/src/oj/contest/my_submissions_list.html
index fb24bef..8c8aa5a 100644
--- a/template/src/oj/contest/my_submissions_list.html
+++ b/template/src/oj/contest/my_submissions_list.html
@@ -18,17 +18,19 @@
             <tr class="" success>
                 <th>#</th>
                 <th>提交时间</th>
-                <th>结果</th>
-                <th>运行时间</th>
                 <th>语言</th>
+                <th>运行时间</th>
+                <th>结果</th>
             </tr>
             </thead>
             <tbody>
             {% for item in submissions %}
-                <tr class="{{ item.result|translate_result_class }}">
+                <tr>
                     <th scope="row"><a href="/submission/{{ item.id }}/">{{ forloop.counter }}</a></th>
                     <td>{{ item.create_time }}</td>
-                    <td>{{ item.result|translate_result }}</td>
+                    <td>
+                        {{ item.language|translate_language }}
+                    </td>
                     <td>
                         {% if item.accepted_answer_time %}
                             {{ item.accepted_answer_time }}ms
@@ -36,8 +38,8 @@
                             --
                         {% endif %}
                     </td>
-                    <td>
-                        {{ item.language|translate_language }}
+                    <td class="alert-{{ item.result|translate_result_class }}">
+                        <strong>{{ item.result|translate_result }}</strong>
                     </td>
                 </tr>
             {% endfor %}
diff --git a/template/src/oj/contest/submissions_list.html b/template/src/oj/contest/submissions_list.html
index 336e9c3..7141585 100644
--- a/template/src/oj/contest/submissions_list.html
+++ b/template/src/oj/contest/submissions_list.html
@@ -21,33 +21,67 @@
                 </li>
             </ul>
         </div>
-        {% if submissions %}
             <table class="table table-bordered">
                 <thead>
                 <tr class="" success>
                     <th>#</th>
-                    <td>用户</td>
+                    <th>题目名称</th>
+                    <th>用户</th>
                     <th>提交时间</th>
-                    <th>结果</th>
+                    <th>
+                        <div class="dropdown">
+                            <a href="#" class="dropdown-toggle" id="languageFilter" data-toggle="dropdown"
+                               aria-haspopup="true" aria-expanded="true">
+                                语言<span class="caret"></span>
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="languageFilter">
+                                <li><a href="/contest/{{ contest.id }}/submissions/?language=1">C</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?language=2">C++</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?language=3">Java</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
+                            </ul>
+                        </div>
+                    </th>
                     <th>运行时间</th>
-                    <th>语言</th>
+                    <th>
+                        <div class="dropdown">
+                            <a href="#" class="dropdown-toggle" id="resultFilter" data-toggle="dropdown"
+                               aria-haspopup="true" aria-expanded="true">
+                                结果<span class="caret"></span>
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="resultFilter">
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=0">Accepted</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=6">Wrong Answer</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=1">Runtime Error</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=2">Time Limit Exceeded</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=3">Memory Limit Exceeded</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=4">Compile Error</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=5">Format Error</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
+                            </ul>
+                        </div>
+                    </th>
                 </tr>
                 </thead>
+                {% if submissions %}
                 <tbody>
-                {% for item in submissions %}
-                    <tr class="{{ item.result|translate_result_class }}">
 
+                {% for item in submissions %}
+                    <tr>
                         {% ifequal item.user_id request.user.id %}
-                            <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
+                            <th scope="row"><a href="/submission/{{ item.id }}/">
                                 {{ forloop.counter |add:start_id }}</a></th>
                         {% else %}
                             <th scope="row">{{ forloop.counter |add:start_id }}</th>
                         {% endifequal %}
-
+                        <th scope="row">
+                            <a href="/contest/{{ item.contest_id }}/problem/{{ item.problem_id }}/">{{ item.title }}</a>
+                        </th>
                         <td>{{ item.user_id|get_username }}</td>
-
                         <td>{{ item.create_time }}</td>
-                        <td>{{ item.result|translate_result }}</td>
+                        <td>
+                            {{ item.language|translate_language }}
+                        </td>
                         <td>
                             {% if item.accepted_answer_time %}
                                 {{ item.accepted_answer_time }}ms
@@ -55,28 +89,28 @@
                                 --
                             {% endif %}
                         </td>
-                        <td>
-                            {{ item.language|translate_language }}
+                        <td class="alert-{{ item.result|translate_result_class }}">
+                            <strong>{{ item.result|translate_result }}</strong>
                         </td>
                     </tr>
                 {% endfor %}
-
                 </tbody>
+                {% else %}
+                    <p>本场比赛还没有提交记录</p>
+                {% endif %}
             </table>
-        {% else %}
-            <p>你还没有提交记录!</p>
-        {% endif %}
+
         <nav>
             <ul class="pager">
                 {% if previous_page %}
                     <li class="previous"><a
-                            href="/contest/{{ contest.id }}/submissions/{{ previous_page }}/">
+                            href="/contest/{{ contest.id }}/submissions/{{ previous_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">
                         <span aria-hidden="true">&larr;</span> 上一页</a></li>
                 {% endif %}
                 {% if next_page %}
                     <li class="next">
-                        <a href="/contest/{{ contest.id }}/submissions/{{ next_page }}/">下一页 <span
-                                aria-hidden="true">&rarr;</span></a></li>
+                        <a href="/contest/{{ contest.id }}/submissions/{{ next_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">
+                            下一页 <span aria-hidden="true">&rarr;</span></a></li>
                 {% endif %}
             </ul>
         </nav>
diff --git a/template/src/oj/contest/submissions_list_admin.html b/template/src/oj/contest/submissions_list_admin.html
new file mode 100644
index 0000000..c8a6745
--- /dev/null
+++ b/template/src/oj/contest/submissions_list_admin.html
@@ -0,0 +1,78 @@
+{% extends 'oj_base.html' %}
+
+{% block body %}
+
+    {% load submission %}
+    {% load user %}
+    <div class="container main">
+        <div class="contest-tab">
+            <ul class="nav nav-tabs nav-tabs-google">
+                <li role="presentation">
+                    <a href="/contest/{{ contest.id }}/">比赛详情</a>
+                </li>
+                <li role="presentation">
+                    <a href="/contest/{{ contest.id }}/problems/">题目</a>
+                </li>
+                <li role="presentation" class="active">
+                    <a href="/contest/{{ contest.id }}/submissions/">提交</a>
+                </li>
+                <li role="presentation">
+                    <a href="/contest/{{ contest.id }}/rank/">排名</a>
+                </li>
+            </ul>
+        </div>
+
+            <table class="table table-bordered">
+                <thead>
+                <tr class="" success>
+                    <th>#</th>
+                    <td>用户</td>
+                    <th>提交时间</th>
+                    <th>结果</th>
+                    <th>运行时间</th>
+                    <th>语言</th>
+                </tr>
+                </thead>
+                {% if submissions %}
+                <tbody>
+                {% for item in submissions %}
+                    <tr class="{{ item.result|translate_result_class }}">
+                        <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
+                                {{ forloop.counter |add:start_id }}</a></th>
+                        <td>{{ item.user_id|get_username }}</td>
+
+                        <td>{{ item.create_time }}</td>
+                        <td>{{ item.result|translate_result }}</td>
+                        <td>
+                            {% if item.accepted_answer_time %}
+                                {{ item.accepted_answer_time }}ms
+                            {% else %}
+                                --
+                            {% endif %}
+                        </td>
+                        <td>
+                            {{ item.language|translate_language }}
+                        </td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+                {% else %}
+                    <p>本场比赛还没有提交记录!</p>
+                {% endif %}
+            </table>
+        <nav>
+            <ul class="pager">
+                {% if previous_page %}
+                    <li class="previous"><a
+                            href="/contest/{{ contest.id }}/submissions/{{ previous_page }}/">
+                        <span aria-hidden="true">&larr;</span> 上一页</a></li>
+                {% endif %}
+                {% if next_page %}
+                    <li class="next">
+                        <a href="/contest/{{ contest.id }}/submissions/{{ next_page }}/">下一页 <span
+                                aria-hidden="true">&rarr;</span></a></li>
+                {% endif %}
+            </ul>
+        </nav>
+    </div>
+{% endblock %}
diff --git a/template/src/oj/problem/problem.html b/template/src/oj/problem/problem.html
index 00b4ce7..515c6a2 100644
--- a/template/src/oj/problem/problem.html
+++ b/template/src/oj/problem/problem.html
@@ -4,8 +4,14 @@
     <div class="container main">
         <ul class="nav nav-tabs nav-tabs-google">
             <li role="presentation" class="active">
-                <a href="/problem/{{ problem.id }}/">题目</a></li>
-            <li role="presentation"><a href="/problem/{{ problem.id }}/submissions/">我的提交</a></li>
+                <a href="/problem/{{ problem.id }}/">题目</a>
+            </li>
+            <li role="presentation">
+                <a href="/problem/{{ problem.id }}/submissions/">我的提交</a>
+            </li>
+            <li role="presentation">
+                <a href="/problems/">返回</a>
+            </li>
         </ul>
         {% include "oj/problem/_problem_header.html" %}
 
@@ -23,7 +29,7 @@
             <div class="problem-section">
                 <label class="problem-label">输出</label>
 
-                <p class="problem-detail">{{ problem.output_description }}k</p>
+                <p class="problem-detail">{{ problem.output_description }}</p>
             </div>
             {% for item in samples %}
                 <div class="problem-section">
@@ -33,7 +39,6 @@
 
                 </div>
                 <div class="problem-section">
-
                     <label class="problem-label">样例输出{{ forloop.counter }}</label>
         <pre>
 {{ item.output }}</pre>
@@ -45,23 +50,19 @@
             {% if problem.hint %}
                 <div class="problem-section hide">
                     <label class="problem-label">提示</label>
-
                     <div class="problem-detail">{{ problem.hint|safe }}</div>
                 </div>
             {% endif %}
             <div class="problem-section hide">
                 <label class="problem-label">标签</label>
-
                 <p class="problem-detail">
                     {% for tag in problem.tags.all %}
                         <span class="label label-success">{{ tag.name }}</span>
                     {% endfor %}
                 </p>
             </div>
-
             <div>
                 <label>选择语言</label>
-
                 <div>
                     <label class="radio-inline">
                         <input type="radio" name="language" value="1" checked> C (gcc 4.8)
@@ -74,7 +75,6 @@
                     </label>
                 </div>
             </div>
-
             <div id="code-field">
                 <label class="problem-label">提交代码</label>
                 <textarea id="code-editor"></textarea>
@@ -85,9 +85,7 @@
                     提交代码
                 </button>
                 <img src="/static/img/loading.gif" id="loading-gif">
-
             </div>
-
             <div id="result">
             </div>
             <hr>
diff --git a/template/src/oj/submission/my_submissions_list.html b/template/src/oj/submission/my_submissions_list.html
index e5eb554..08cf17d 100644
--- a/template/src/oj/submission/my_submissions_list.html
+++ b/template/src/oj/submission/my_submissions_list.html
@@ -1,7 +1,6 @@
 {% extends 'oj_base.html' %}
 
 {% block body %}
-
 {% load submission %}
 <div class="container main">
     <div class="col-md-9 col-lg-9">
@@ -9,6 +8,7 @@
             <thead>
             <tr>
                 <th>#</th>
+                <th>题目名称</th>
                 <th>提交时间</th>
                 <th>
                     <div class="dropdown">
@@ -48,8 +48,12 @@
             <tbody>
             {% for item in submissions %}
             <tr>
-                <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
-                    {{ forloop.counter |add:start_id }}</a></th>
+                <th scope="row">
+                    <a href="/submission/{{ item.id }}/">{{ forloop.counter |add:start_id }}</a>
+                </th>
+                <td>
+                    <a href="/problem/{{ item.problem_id }}/">{{ item.problem_id }}</a>
+                </td>
                 <td>{{ item.create_time }}</td>
                 <td>
                     {{ item.language|translate_language }}
@@ -92,4 +96,4 @@
         {% include "oj/announcement/_announcement_panel.html" %}
     </div>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/template/src/oj_base.html b/template/src/oj_base.html
index 534c4db..56ba614 100644
--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@@ -56,7 +56,7 @@
                         {{ request.user.username }}
                         <span class="caret"></span></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/submission/">我的提交</a></li>
+                        <li><a href="/submissions/">我的提交</a></li>
                         <li><a href="#">我的资料</a></li>
                         <li role="separator" class="divider"></li>
                         <li><a href="/logout/">退出</a></li>
@@ -97,4 +97,4 @@
 </div>
 <!-- footer end -->
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/utils/templatetags/problem.py b/utils/templatetags/problem.py
index 78ee4ea..412c91d 100644
--- a/utils/templatetags/problem.py
+++ b/utils/templatetags/problem.py
@@ -4,7 +4,7 @@
 def get_problem_accepted_radio(problem):
     if problem.total_submit_number:
         return str(int((problem.total_accepted_number * 100) / problem.total_submit_number)) \
-               + "% (" + str(problem.total_accepted_number) + "/" + str(problem.total_submit_number) + ")"
+               + "% (" + str(problem.total_accepted_number) + " / " + str(problem.total_submit_number) + ")"
     return "0%"
 
 

From 8287a722ec7eeafe0348982e37f5fc60e8298cbe Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 11:31:30 +0800
Subject: [PATCH 23/38] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E7=BA=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=AF=94=E8=B5=9B=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7=E5=BC=8F=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oj/contest/submissions_list_admin.html    | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/template/src/oj/contest/submissions_list_admin.html b/template/src/oj/contest/submissions_list_admin.html
index c8a6745..f65f141 100644
--- a/template/src/oj/contest/submissions_list_admin.html
+++ b/template/src/oj/contest/submissions_list_admin.html
@@ -1,5 +1,119 @@
 {% extends 'oj_base.html' %}
 
+{% block body %}
+
+    {% load submission %}
+    {% load user %}
+    <div class="container main">
+        <div class="contest-tab">
+            <ul class="nav nav-tabs nav-tabs-google">
+                <li role="presentation">
+                    <a href="/contest/{{ contest.id }}/">比赛详情</a>
+                </li>
+                <li role="presentation">
+                    <a href="/contest/{{ contest.id }}/problems/">题目</a>
+                </li>
+                <li role="presentation" class="active">
+                    <a href="/contest/{{ contest.id }}/submissions/">提交</a>
+                </li>
+                <li role="presentation">
+                    <a href="/contest/{{ contest.id }}/rank/">排名</a>
+                </li>
+            </ul>
+        </div>
+            <table class="table table-bordered">
+                <thead>
+                <tr class="" success>
+                    <th>#</th>
+                    <th>题目名称</th>
+                    <th>用户</th>
+                    <th>提交时间</th>
+                    <th>
+                        <div class="dropdown">
+                            <a href="#" class="dropdown-toggle" id="languageFilter" data-toggle="dropdown"
+                               aria-haspopup="true" aria-expanded="true">
+                                语言<span class="caret"></span>
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="languageFilter">
+                                <li><a href="/contest/{{ contest.id }}/submissions/?language=1">C</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?language=2">C++</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?language=3">Java</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
+                            </ul>
+                        </div>
+                    </th>
+                    <th>运行时间</th>
+                    <th>
+                        <div class="dropdown">
+                            <a href="#" class="dropdown-toggle" id="resultFilter" data-toggle="dropdown"
+                               aria-haspopup="true" aria-expanded="true">
+                                结果<span class="caret"></span>
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="resultFilter">
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=0">Accepted</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=6">Wrong Answer</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=1">Runtime Error</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=2">Time Limit Exceeded</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=3">Memory Limit Exceeded</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=4">Compile Error</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/?result=5">Format Error</a></li>
+                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
+                            </ul>
+                        </div>
+                    </th>
+                </tr>
+                </thead>
+                {% if submissions %}
+                <tbody>
+
+                {% for item in submissions %}
+                    <tr>
+                        <th scope="row"><a href="/submission/{{ item.id }}/">
+                                {{ forloop.counter |add:start_id }}</a></th>
+                        <th scope="row">
+                            <a href="/contest/{{ item.contest_id }}/problem/{{ item.problem_id }}/">{{ item.title }}</a>
+                        </th>
+                        <td>{{ item.user_id|get_username }}</td>
+                        <td>{{ item.create_time }}</td>
+                        <td>
+                            {{ item.language|translate_language }}
+                        </td>
+                        <td>
+                            {% if item.accepted_answer_time %}
+                                {{ item.accepted_answer_time }}ms
+                            {% else %}
+                                --
+                            {% endif %}
+                        </td>
+                        <td class="alert-{{ item.result|translate_result_class }}">
+                            <strong>{{ item.result|translate_result }}</strong>
+                        </td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+                {% else %}
+                    <p>本场比赛还没有提交记录</p>
+                {% endif %}
+            </table>
+
+        <nav>
+            <ul class="pager">
+                {% if previous_page %}
+                    <li class="previous"><a
+                            href="/contest/{{ contest.id }}/submissions/{{ previous_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">
+                        <span aria-hidden="true">&larr;</span> 上一页</a></li>
+                {% endif %}
+                {% if next_page %}
+                    <li class="next">
+                        <a href="/contest/{{ contest.id }}/submissions/{{ next_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">
+                            下一页 <span aria-hidden="true">&rarr;</span></a></li>
+                {% endif %}
+            </ul>
+        </nav>
+    </div>
+{% endblock %}
+{% extends 'oj_base.html' %}
+
 {% block body %}
 
     {% load submission %}

From bd014b5c40af09bbf16b8a225646f421e13fc6cd Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 11:38:11 +0800
Subject: [PATCH 24/38] =?UTF-8?q?=E5=88=9A=E5=88=9A=E4=B8=8D=E5=B0=8F?=
 =?UTF-8?q?=E5=BF=83=E6=8A=8A=E4=B8=A4=E4=B8=AA=E6=96=87=E4=BB=B6=E7=B2=98?=
 =?UTF-8?q?=E4=B8=80=E8=B5=B7=E4=BA=86=EF=BC=8C=E5=8E=9F=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?=E5=BF=98=E6=B8=85=E4=BA=86=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oj/contest/submissions_list_admin.html    | 86 ++-----------------
 1 file changed, 6 insertions(+), 80 deletions(-)

diff --git a/template/src/oj/contest/submissions_list_admin.html b/template/src/oj/contest/submissions_list_admin.html
index f65f141..5f1b719 100644
--- a/template/src/oj/contest/submissions_list_admin.html
+++ b/template/src/oj/contest/submissions_list_admin.html
@@ -68,8 +68,12 @@
 
                 {% for item in submissions %}
                     <tr>
-                        <th scope="row"><a href="/submission/{{ item.id }}/">
+                        {% ifequal item.user_id request.user.id %}
+                            <th scope="row"><a href="/submission/{{ item.id }}/">
                                 {{ forloop.counter |add:start_id }}</a></th>
+                        {% else %}
+                            <th scope="row">{{ forloop.counter |add:start_id }}</th>
+                        {% endifequal %}
                         <th scope="row">
                             <a href="/contest/{{ item.contest_id }}/problem/{{ item.problem_id }}/">{{ item.title }}</a>
                         </th>
@@ -111,82 +115,4 @@
             </ul>
         </nav>
     </div>
-{% endblock %}
-{% extends 'oj_base.html' %}
-
-{% block body %}
-
-    {% load submission %}
-    {% load user %}
-    <div class="container main">
-        <div class="contest-tab">
-            <ul class="nav nav-tabs nav-tabs-google">
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/">比赛详情</a>
-                </li>
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/problems/">题目</a>
-                </li>
-                <li role="presentation" class="active">
-                    <a href="/contest/{{ contest.id }}/submissions/">提交</a>
-                </li>
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/rank/">排名</a>
-                </li>
-            </ul>
-        </div>
-
-            <table class="table table-bordered">
-                <thead>
-                <tr class="" success>
-                    <th>#</th>
-                    <td>用户</td>
-                    <th>提交时间</th>
-                    <th>结果</th>
-                    <th>运行时间</th>
-                    <th>语言</th>
-                </tr>
-                </thead>
-                {% if submissions %}
-                <tbody>
-                {% for item in submissions %}
-                    <tr class="{{ item.result|translate_result_class }}">
-                        <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
-                                {{ forloop.counter |add:start_id }}</a></th>
-                        <td>{{ item.user_id|get_username }}</td>
-
-                        <td>{{ item.create_time }}</td>
-                        <td>{{ item.result|translate_result }}</td>
-                        <td>
-                            {% if item.accepted_answer_time %}
-                                {{ item.accepted_answer_time }}ms
-                            {% else %}
-                                --
-                            {% endif %}
-                        </td>
-                        <td>
-                            {{ item.language|translate_language }}
-                        </td>
-                    </tr>
-                {% endfor %}
-                </tbody>
-                {% else %}
-                    <p>本场比赛还没有提交记录!</p>
-                {% endif %}
-            </table>
-        <nav>
-            <ul class="pager">
-                {% if previous_page %}
-                    <li class="previous"><a
-                            href="/contest/{{ contest.id }}/submissions/{{ previous_page }}/">
-                        <span aria-hidden="true">&larr;</span> 上一页</a></li>
-                {% endif %}
-                {% if next_page %}
-                    <li class="next">
-                        <a href="/contest/{{ contest.id }}/submissions/{{ next_page }}/">下一页 <span
-                                aria-hidden="true">&rarr;</span></a></li>
-                {% endif %}
-            </ul>
-        </nav>
-    </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file

From 4be960093941a1b707dc7c9b0e3dab27aacd2f0b Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 11:42:20 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=8D=E5=8F=B0?=
 =?UTF-8?q?=E6=AF=94=E8=B5=9B=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AF=E8=A7=81=E6=AF=94=E8=B5=9B?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/oj/contest/submissions_list_admin.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/template/src/oj/contest/submissions_list_admin.html b/template/src/oj/contest/submissions_list_admin.html
index 5f1b719..8f1660b 100644
--- a/template/src/oj/contest/submissions_list_admin.html
+++ b/template/src/oj/contest/submissions_list_admin.html
@@ -68,12 +68,8 @@
 
                 {% for item in submissions %}
                     <tr>
-                        {% ifequal item.user_id request.user.id %}
-                            <th scope="row"><a href="/submission/{{ item.id }}/">
+                        <th scope="row"><a href="/submission/{{ item.id }}/">
                                 {{ forloop.counter |add:start_id }}</a></th>
-                        {% else %}
-                            <th scope="row">{{ forloop.counter |add:start_id }}</th>
-                        {% endifequal %}
                         <th scope="row">
                             <a href="/contest/{{ item.contest_id }}/problem/{{ item.problem_id }}/">{{ item.title }}</a>
                         </th>

From 254427ef7c6101452afc2bcc47f1b264be1ae550 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 18:52:13 +0800
Subject: [PATCH 26/38] =?UTF-8?q?[=E5=90=8E=E5=8F=B0-=E5=89=8D=E7=AB=AF]?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=86=E6=AF=94=E8=B5=9B=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BC=80=E6=94=BE=E6=8E=92=E5=90=8D=E9=80=89?=
 =?UTF-8?q?=20=E9=A1=B9,=E5=A4=A9=E5=8A=A0=E5=B0=81=E6=A6=9C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/admin/contest/add_contest.html  | 28 ++++++++------------
 template/src/admin/contest/contest_list.html | 19 +++++--------
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/template/src/admin/contest/add_contest.html b/template/src/admin/contest/add_contest.html
index b374ec8..4dd8c96 100644
--- a/template/src/admin/contest/add_contest.html
+++ b/template/src/admin/contest/add_contest.html
@@ -57,36 +57,30 @@
             <div class="col-md-12">
                 <div ms-repeat="choseGroupList" class="group-tag" ms-click="removeGroup($index)">{{el.name}}</div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-3">
+                <label>封榜时间(结束前/min)</label>
+            </div>
+            <div class="col-md-3">
                 <label>排名方式</label>
             </div>
-            <div class="col-md-3">
-                <label>结束前是否开放排名</label>
-            </div>
-            <div class="col-md-3">
+            <div class="col-md-6">
                 <label>是否公开提交记录</label>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-3">
+                <input class="form-control" type="number" name="hideRank" ms-duplex="hideRank" data-error="请填写封榜时间" required>
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="col-md-3">
                 <div class="form-group">
                     <label><input type="radio" name="mode" ms-duplex-string="mode" value="0">
                         <small>ACM</small>
                     </label>
                     <label><input type="radio" name="mode" ms-duplex-string="mode" value="1">
-                        <small>AC数量</small>
-                    </label>
-                    <label><input type="radio" name="mode" ms-duplex-string="mode" value="2">
                         <small>分数</small>
                     </label>
                 </div>
             </div>
-            <div class="col-md-3">
-                <div class="form-group">
-                    <label class="text"><input type="checkbox" ms-duplex-checked="showRank">
-                        <small>开放排名</small>
-                    </label>
-                </div>
-            </div>
-            <div class="col-md-3">
+            <div class="col-md-6">
                 <div class="form-group">
                     <label class="text"><input type="checkbox" ms-duplex-checked="showSubmission">
                         <small>允许查看提交记录</small>
diff --git a/template/src/admin/contest/contest_list.html b/template/src/admin/contest/contest_list.html
index 945d1f5..fc17ed0 100644
--- a/template/src/admin/contest/contest_list.html
+++ b/template/src/admin/contest/contest_list.html
@@ -112,7 +112,12 @@
             <div class="col-md-3">
 
             </div>
-            <div class="col-md-4">
+            <div class="col-md-3">
+                <label>封榜时间(结束前/min)</label>
+                <input class="form-control" name="hideRank" ms-duplex="hideRank" type="number" data-error="请填写封榜时间" required>
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="col-md-3">
                 <label>排名方式</label>
 
                 <div class="form-group">
@@ -120,9 +125,6 @@
                         <small>ACM</small>
                     </label>
                     <label><input type="radio" name="mode" ms-duplex-string="editMode" value="1">
-                        <small>AC数量</small>
-                    </label>
-                    <label><input type="radio" name="mode" ms-duplex-string="editMode" value="2">
                         <small>分数</small>
                     </label>
                 </div>
@@ -133,15 +135,6 @@
                     <small> 可见</small>
                 </label>
             </div>
-            <div class="col-md-3">
-                <label>结束前是否开放排名</label>
-
-                <div class="form-group">
-                    <label class="text"><input type="checkbox" ms-duplex-checked="editShowRank">
-                        <small>开放排名</small>
-                    </label>
-                </div>
-            </div>
             <div class="col-md-3">
                 <label>是否公开提交记录</label>
 

From 17f10f262bca1c4309c506cca1a3f10ea608c47a Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 20:05:19 +0800
Subject: [PATCH 27/38] =?UTF-8?q?[=E5=90=8E=E5=8F=B0-=E5=89=8D=E7=AB=AF]?=
 =?UTF-8?q?=E4=B8=BB=E8=A6=81=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=AF=94=E8=B5=9B=E5=92=8C=E4=BF=AE=E6=94=B9=E6=AF=94=E8=B5=9B?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86,=E5=8E=BB=E6=8E=89=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E7=BB=93=E6=9D=9F=E5=89=8D=E5=BC=80=E6=94=BE=E6=8E=92?=
 =?UTF-8?q?=E5=90=8D=E8=BF=99=E4=B8=80=E9=80=89=E9=A1=B9,=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B0=81=E6=A6=9C=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/contest/addContest.js |  7 ++---
 .../src/js/app/admin/contest/contestList.js   |  8 +++---
 template/src/admin/contest/add_contest.html   | 28 ++++++++-----------
 template/src/admin/contest/contest_list.html  | 25 ++++++-----------
 4 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js
index a87e4e2..e1c8b54 100644
--- a/static/src/js/app/admin/contest/addContest.js
+++ b/static/src/js/app/admin/contest/addContest.js
@@ -2,7 +2,6 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
         "validator"],
     function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
 
-        //avalon.vmodels.add_contest = null;
         $("#add-contest-form").validator().on('submit', function (e) {
             if (!e.isDefaultPrevented()){
                 e.preventDefault();
@@ -11,7 +10,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                     description: vm.description,
                     mode: vm.mode,
                     contest_type: 0,
-                    show_rank: vm.showRank,
+                    hide_rank: vm.hideRank,
                     show_user_submission: vm.showSubmission,
                     start_time: vm.startTime,
                     end_time: vm.endTime,
@@ -52,7 +51,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                                 vm.endTime        = "";
                                 vm.password       = "";
                                 vm.mode           = "";
-                                vm.showRank       = false;
+                                vm.hideRank       = 0;
                                 vm.showSubmission = false;
                                 vm.group          = "-1";
                                 vm.groupList      = [];
@@ -81,7 +80,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
             endTime: "",
             password: "",
             mode: "",
-            showRank: false,
+            hideRank: 0,
             showSubmission: false,
             group: "-1",
             groupList: [],
diff --git a/static/src/js/app/admin/contest/contestList.js b/static/src/js/app/admin/contest/contestList.js
index c920cd6..cabf4d0 100644
--- a/static/src/js/app/admin/contest/contestList.js
+++ b/static/src/js/app/admin/contest/contestList.js
@@ -11,7 +11,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                     description:          vm.editDescription,
                     mode:                 vm.editMode,
                     contest_type:         0,
-                    show_rank:            vm.editShowRank,
+                    hide_rank:            vm.editHideRank,
                     show_user_submission: vm.editShowSubmission,
                     start_time:           vm.editStartTime,
                     end_time:             vm.editEndTime,
@@ -84,7 +84,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
         vm.editStartTime= "";
         vm.editEndTime= "";
         vm.editMode= "";
-        vm.editShowRank= false;
+        vm.editHideRank= 0;
         vm.editShowSubmission= false;
         vm.editProblemList= [];
         vm.editVisible= false;
@@ -113,7 +113,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
             editStartTime: "",
             editEndTime: "",
             editMode: "",
-            editShowRank: false,
+            editHideRank: false,
             editShowSubmission: false,
             editProblemList: [],
             editVisible: false,
@@ -178,7 +178,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                         vm.group = "0";
                         vm.addGroup()//vm.editChoseGroupList = [0]; id 0 is for the group of everyone~
                     }
-                    vm.editShowRank = vm.contestList[contestId-1].show_rank;
+                    vm.editHideRank = vm.contestList[contestId-1].Hide_rank;
                     vm.editShowSubmission = vm.contestList[contestId-1].show_user_submission;
                     editor("#editor").setValue(vm.contestList[contestId-1].description);
                     vm.editingProblemContestIndex = 0;
diff --git a/template/src/admin/contest/add_contest.html b/template/src/admin/contest/add_contest.html
index 4dd8c96..9ea2b5f 100644
--- a/template/src/admin/contest/add_contest.html
+++ b/template/src/admin/contest/add_contest.html
@@ -7,7 +7,7 @@
             <div class="col-md-12">
                 <div class="form-group">
                     <input type="text" name="name" class="form-control" ms-duplex="title"
-                           data-error="请填写比赛名称(名称不能超过50个字)" ms-attr-readonly="contestCreated" required>
+                           data-error="请填写比赛名称(名称不能超过50个字)" required>
 
                     <div class="help-block with-errors"></div>
                 </div>
@@ -21,21 +21,26 @@
                     <p class="error-info" ms-visible="description==''">请填写比赛描述</p>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <label>开始时间</label>
                 <div class="form-group">
                     <input type="text" class="form-control" name="start_time" id="contest_start_time"
                            ms-duplex="startTime" data-error="请填写比赛开始时间" required>
-
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <label>结束时间</label>
                 <div class="form-group">
                     <input type="text" class="form-control" name="end_time" id="contest_end_time"
                            ms-duplex="endTime" data-error="请填写比赛结束时间" required>
-
+                    <div class="help-block with-errors"></div>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <label>封榜时间(结束前/min)</label>
+                <div class="form-group">
+                    <input class="form-control" type="text" ms-duplex="hideRank" data-error="请填写封榜时间" required>
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
@@ -57,20 +62,8 @@
             <div class="col-md-12">
                 <div ms-repeat="choseGroupList" class="group-tag" ms-click="removeGroup($index)">{{el.name}}</div>
             </div>
-            <div class="col-md-3">
-                <label>封榜时间(结束前/min)</label>
-            </div>
             <div class="col-md-3">
                 <label>排名方式</label>
-            </div>
-            <div class="col-md-6">
-                <label>是否公开提交记录</label>
-            </div>
-            <div class="col-md-3">
-                <input class="form-control" type="number" name="hideRank" ms-duplex="hideRank" data-error="请填写封榜时间" required>
-                <div class="help-block with-errors"></div>
-            </div>
-            <div class="col-md-3">
                 <div class="form-group">
                     <label><input type="radio" name="mode" ms-duplex-string="mode" value="0">
                         <small>ACM</small>
@@ -81,6 +74,7 @@
                 </div>
             </div>
             <div class="col-md-6">
+                <label>是否公开提交记录</label>
                 <div class="form-group">
                     <label class="text"><input type="checkbox" ms-duplex-checked="showSubmission">
                         <small>允许查看提交记录</small>
diff --git a/template/src/admin/contest/contest_list.html b/template/src/admin/contest/contest_list.html
index fc17ed0..99c54fe 100644
--- a/template/src/admin/contest/contest_list.html
+++ b/template/src/admin/contest/contest_list.html
@@ -66,7 +66,7 @@
                     <p class="error-info" ms-visible="editDescription==''" >请填写比赛描述</p>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <label>开始时间</label>
 
                 <div class="form-group">
@@ -76,7 +76,7 @@
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <label>结束时间</label>
 
                 <div class="form-group">
@@ -86,6 +86,13 @@
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
+            <div class="col-md-3">
+                <label>封榜时间(结束前/min)</label>
+                <div class="form-group">
+                    <input class="form-control" ms-duplex="editHideRank" type="number" data-error="请填写封榜时间" required>
+                    <div class="help-block with-errors"></div>
+                </div>
+            </div>
             <div class="col-md-6">
                 <label>允许参加的用户</label>
 
@@ -103,20 +110,6 @@
             <div class="col-md-12">
                 <div ms-repeat="choseGroupList" class="group-tag" ms-click="removeGroup($index)">{{el.name}}</div>
             </div>
-            <div class="col-md-6">
-
-            </div>
-            <div class="col-md-3">
-
-            </div>
-            <div class="col-md-3">
-
-            </div>
-            <div class="col-md-3">
-                <label>封榜时间(结束前/min)</label>
-                <input class="form-control" name="hideRank" ms-duplex="hideRank" type="number" data-error="请填写封榜时间" required>
-                <div class="help-block with-errors"></div>
-            </div>
             <div class="col-md-3">
                 <label>排名方式</label>
 

From 81f7b09d838a01357dea9d6027203d8c45b0fe4e Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 21:01:37 +0800
Subject: [PATCH 28/38] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=EF=BC=8C=E5=BF=98=E8=AE=B0=E5=8E=BB=E6=8E=89=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E6=A0=87=E5=BF=97=E4=BA=86=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/oj/contest/submissions_list.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/template/src/oj/contest/submissions_list.html b/template/src/oj/contest/submissions_list.html
index 0ae3031..1424bb1 100644
--- a/template/src/oj/contest/submissions_list.html
+++ b/template/src/oj/contest/submissions_list.html
@@ -65,10 +65,6 @@
                 </thead>
                 {% if submissions %}
                 <tbody>
-<<<<<<< HEAD
-
-=======
->>>>>>> dev
                 {% for item in submissions %}
                     <tr>
                         {% ifequal item.user_id request.user.id %}

From 9b83a2e24982b82b18ef7f2598a10279055bf813 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Fri, 11 Sep 2015 20:34:15 +0800
Subject: [PATCH 29/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=B7=AF=E5=BE=84=E5=9C=A8setting=5Floacl=E5=92=8Cser?=
 =?UTF-8?q?ver=E9=87=8C=E6=9A=82=E6=97=B6=E5=9C=A8static/src/upload=5Fimag?=
 =?UTF-8?q?e/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oj/local_settings.py                   |  4 +++-
 oj/server_settings.py                  |  2 ++
 oj/urls.py                             |  2 ++
 static/src/js/lib/simditor/uploader.js | 10 ++++++++++
 static/src/js/utils/editor.js          |  2 +-
 utils/views.py                         | 27 ++++++++++++++++++++++++++
 6 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 utils/views.py

diff --git a/oj/local_settings.py b/oj/local_settings.py
index b923291..081b295 100644
--- a/oj/local_settings.py
+++ b/oj/local_settings.py
@@ -28,6 +28,8 @@ DATABASES = {
 DEBUG = True
 
 # 同理 这是 web 服务器的上传路径
-TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
+TEST_CASE_DIR =    os.path.join(BASE_DIR, 'test_case/')
 
 ALLOWED_HOSTS = []
+
+IMAGE_UPLOAD_DIR = os.path.join(BASE_DIR, 'static/src/upload_image/')
\ No newline at end of file
diff --git a/oj/server_settings.py b/oj/server_settings.py
index 185bf6b..916f143 100644
--- a/oj/server_settings.py
+++ b/oj/server_settings.py
@@ -35,3 +35,5 @@ DEBUG = True
 TEST_CASE_DIR = '/root/test_case/'
 
 ALLOWED_HOSTS = ['*']
+
+IMAGE_UPLOAD_DIR = '/var/mnt/source/OnlineJudeg/static/src/upload_image/'
diff --git a/oj/urls.py b/oj/urls.py
index a5582d2..1accf7c 100644
--- a/oj/urls.py
+++ b/oj/urls.py
@@ -19,6 +19,7 @@ from problem.views import TestCaseUploadAPIView, ProblemTagAdminAPIView, Problem
 from submission.views import SubmissionAPIView, SubmissionAdminAPIView, SubmissionShareAPIView
 from contest_submission.views import ContestSubmissionAPIView, ContestSubmissionAdminAPIView
 from monitor.views import QueueLengthMonitorAPIView
+from utils.views import SimditorImageUploadAPIView
 
 from contest_submission.views import contest_problem_my_submissions_list_page
 
@@ -112,4 +113,5 @@ urlpatterns = [
     url(r'^help/$', TemplateView.as_view(template_name="utils/help.html"), name="help_page"),
 
     url(r'^api/submission/share/$', SubmissionShareAPIView.as_view(), name="submission_share_api"),
+    url(r'^api/admin/up_load_image/$', SimditorImageUploadAPIView.as_view(), name="simditor_upload_image"),
 ]
diff --git a/static/src/js/lib/simditor/uploader.js b/static/src/js/lib/simditor/uploader.js
index d96860e..fc039d7 100644
--- a/static/src/js/lib/simditor/uploader.js
+++ b/static/src/js/lib/simditor/uploader.js
@@ -143,6 +143,16 @@ Uploader = (function(superClass) {
       processData: false,
       contentType: false,
       type: 'POST',
+      beforeSend: function(){
+        var name = "csrftoken=";
+        var ca = document.cookie.split(';');
+        for (var i = 0; i < ca.length; i++) {
+            var c = ca[i];
+            while (c.charAt(0) == ' ') c = c.substring(1);
+            if (c.indexOf(name) != -1) name = c.substring(name.length, c.length);
+        }
+        arguments[0].setRequestHeader("X-CSRFToken", name);
+      },
       headers: {
         'X-File-Name': encodeURIComponent(file.name)
       },
diff --git a/static/src/js/utils/editor.js b/static/src/js/utils/editor.js
index bb09bb4..03ee16c 100644
--- a/static/src/js/utils/editor.js
+++ b/static/src/js/utils/editor.js
@@ -8,7 +8,7 @@ define("editor", ["simditor"], function(Simditor){
             toolbarFloat: false,
             defaultImage: null,
             upload: {
-                url: "",
+                url: "/api/admin/up_load_image/",
                 params: null,
                 fileKey: "image",
                 connectionCount: 3,
diff --git a/utils/views.py b/utils/views.py
new file mode 100644
index 0000000..af3afc9
--- /dev/null
+++ b/utils/views.py
@@ -0,0 +1,27 @@
+# coding=utf-8
+
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from django.conf import settings
+
+from utils.shortcuts import rand_str
+
+
+class SimditorImageUploadAPIView(APIView):
+    def post(self, request):
+        if "image" not in request.FILES:
+            return Response(data={
+                "success": False,
+                "msg": "上传失败",
+                "file_path": "/"})
+        img = request.FILES["image"]
+
+        image_name = rand_str() + '.' + str(request.FILES["image"].name.split('.')[-1])
+        image_dir = settings.IMAGE_UPLOAD_DIR + image_name
+        with open(image_dir, "wb") as imageFile:
+            for chunk in img:
+                imageFile.write(chunk)
+        return Response(data={
+            "success": True,
+            "msg": "error message",
+            "file_path": "/static/upload_image/" + image_name})

From 633ba3c519cc6219ccd505b63459a80a1a5a500d Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Fri, 11 Sep 2015 20:35:24 +0800
Subject: [PATCH 30/38] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=AD=98=E6=94=BE?=
 =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=9A=84=E5=9B=BE=E7=89=87=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../66511fb14e039e093b9f19d44c67f992.png         |   0
 .../75aa1ba23140193b469f1e341b70d259.png         |   0
 .../afd66491faa7bc71504bbebbf2472c6a.png         | Bin 0 -> 1997 bytes
 .../b06f164d2be39b9d00856667bf5f298a.png         |   0
 .../efe52ca24ac21daeb27249021854b806.png         |   0
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 static/src/upload_image/66511fb14e039e093b9f19d44c67f992.png
 create mode 100644 static/src/upload_image/75aa1ba23140193b469f1e341b70d259.png
 create mode 100644 static/src/upload_image/afd66491faa7bc71504bbebbf2472c6a.png
 create mode 100644 static/src/upload_image/b06f164d2be39b9d00856667bf5f298a.png
 create mode 100644 static/src/upload_image/efe52ca24ac21daeb27249021854b806.png

diff --git a/static/src/upload_image/66511fb14e039e093b9f19d44c67f992.png b/static/src/upload_image/66511fb14e039e093b9f19d44c67f992.png
new file mode 100644
index 0000000..e69de29
diff --git a/static/src/upload_image/75aa1ba23140193b469f1e341b70d259.png b/static/src/upload_image/75aa1ba23140193b469f1e341b70d259.png
new file mode 100644
index 0000000..e69de29
diff --git a/static/src/upload_image/afd66491faa7bc71504bbebbf2472c6a.png b/static/src/upload_image/afd66491faa7bc71504bbebbf2472c6a.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fcf1764beee466fde889375dd47f801f7fea3f2
GIT binary patch
literal 1997
zcmdT_do<hG7B+*SR8&#%%=EEpq+aQ?sfv^!jFF0BFk(EKax*jukxW!PS~I9yk7}!0
z+O&$IZ5SFfo>!->s$|F@#v?+DAjBgjBaxb)`TPET*Sc%%bN1P1?RECI&ffdmx&D6M
zdOBu0YHDhFKHqo-0D22pquQSXJMqeAYk*Qua`y?+*47@M#!dmIDHR<`4J5}>>Cu!J
zwSSSw#2C9IJS8TEltds?SJb=CsHtg1`FNs&lJ6}Gk%Yh>EPB?G;^Uzwy<nh21X@6M
zxu=PBZRVGLXpKmNdqx^s2CrYEg2F9=66TLkYp99Wp?`gD>AYB(&prgw%mQWd&zo_-
zo)GsM#+OaB-%paN(p&?trcmNKRpPm<iHG6#=5B5!5<Rus1I|JJd!e>Xx-Ds<_C-uR
zd&|^)kuz4czvIVWm5Ukk!HxK+x|XxFudc1L#;@xaZOM*}9Ar;gp;mhi&pi66%xa5p
zIE?%=x_pPoDZ<L({8r*g5N+UG``n*TT0J_lDI6}LC0kIQDZu^l&OaxHJ?Y|JXcCsA
z6Gq<ef&7VJ`Dt-^SugWT?aag81z`O8R_f84oWu{=u(|iIuXSet_O0RMv<}m~wD?V_
zkRhGm*x{PN_yY$H%!$RiS(&i8q1wPU`ihmgIb(gs=T#M<Bl;K8pn!$LGF?m~CY$0z
z%Kbw*lq%TKlD=6AC-n@ZgH{l|uXlAd0gLS)sgLYuBHPkcil+Dx5D3(nrfgm}A&ELI
zHM+T6%xtNNLxcuub#?kT^s#%VlVXLfw5K8UlU*4*LqkJK`HH@!Gdq@7dJ&E|apD95
z(KcZf8yg!?J5+ouq*Q5eN0NWeYOyNdM^R^*IsD=aAWREcB%SPFtWI?=EG%G-4i4yy
zHxt_~$>wtOAyQFS#$T(`?&Xe-jtLS03-Dmbr92+*ECxe8zr!y0;==P$0C9b2!%Og>
zNR*-YxFGI-070glQ0S;sD(r(ZdJg?OUVdKQUJ$6DurLRrr&youo1dRwT3UL1wrs5P
zQbDxYLzf|so&rl<k5g}!MxXb9Wm__Fb}-n?>`Ay480`4Q!Zp2p-Sow3sn<x}RYAoe
zDxN#XD?3)gU@-DwUFoVgLRP-{sbKr+02@4JLtDSz=D;;OX_60sk4it4Fo1&=KYBJW
zP|A9^@eO#9mgS%sTsUJ^U*m+5Y#5{%O^+kVlkK(PU&G;ZB!ur24b1MjqOR3Ax>V&`
z(wVWt?7d*+n!YU+B1Xy->Pa1->=e(tnAp_RQ~-2HeFQS&Q)*<SXlCXD7F#Gu`_87~
zsO}D$IibtESP=#-c20cnnctPLJa!V#9U2O{HSCmKn^i6iuML74=?I0wY2SOsug^Dx
z+S=RNdPe>me<#MERo~0odvJj|`ytY}#39nJdXO%i$n7+uiyNOcNqZfNt;cKNr%!Jw
z<zzetUMB2JV{Aau6d!BXOJnUza7}UF35VO2YcA2U0{M~S*k=A|i{IQdSq=x+4E+pQ
z4qo#<Xo){ck`Yy74Q6?0u9SW1pY|8`)!IeX?es;@Gc8VDYRvyVx=#6$7^kCe%cbFy
zzkPCLw`WWjp_MrOuGwLN1<PH^S-4RhUP;sJB_rS2RQAmt_dcFm!WEP`McQ+$BPd~H
zRqDVD^CFCdeAm6l-{83b2bpYwjTzd0!J@aWpx+{Ew}~A$oJPy-wu!>%_j#M1H_}Dy
zY)AS?n;U`;@Q$Jpyu8Ol(sZ41V<5$Hh6!eajM)*83Zy9kxu1end&+W6`B+n5zcTzZ
z1Wq>6{+_4;>Q5$<<ue!lG|bz4@m%GX+z`4Kt1t_+R4iSV6&`UCUDga1D}Zi;7N=}3
z-Q}4R9Ue1M*CvdhK&R$y-g&eUd!1pi8$IPFc)7tt!aFQaE~nKz+_>#HhW|x?LrW7;
z5~7>5A*yKu;+hV|AHSQ&GuL##-3ghS?JEJUQdg%?&i5xdN!9nwn{w-Ktv#sXoPog-
zr(b5()zuXh6;=LDE4bj&^Hp5+WA8RukA~R%*URF^%dZG>Q&x*9hjDH9ug44dQtPl4
zZHjy!i>|{_{zF=bt9+?(*orMht_5U{MYpIB8nQ|19OY$!-9fsTU<oA%t-RWBY?3ht
z;kldTX4u#d<ut9g!achrNB@~mg0K)C(%bx2-x-qO?jwjdyNoFG-8Lazdie*vMDgb4
zxo>CTxy>Y(dG1ZoDa(JV2XOrV5Oj+~&&g2Zip1_eP`;pVwh=hM`2yst5149AjMLRA
fj?I6cXxr+@{Vx5L_UZe8fvo0(_VcWBkIMWTEfv!^

literal 0
HcmV?d00001

diff --git a/static/src/upload_image/b06f164d2be39b9d00856667bf5f298a.png b/static/src/upload_image/b06f164d2be39b9d00856667bf5f298a.png
new file mode 100644
index 0000000..e69de29
diff --git a/static/src/upload_image/efe52ca24ac21daeb27249021854b806.png b/static/src/upload_image/efe52ca24ac21daeb27249021854b806.png
new file mode 100644
index 0000000..e69de29

From fe3b176be7ec203b959a5fab3093ae0bd625ee6f Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Fri, 11 Sep 2015 20:41:08 +0800
Subject: [PATCH 31/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9.gitignore,=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84=E5=9B=BE=E7=89=87,=E5=88=A0?=
 =?UTF-8?q?=E6=8E=89=E5=88=9A=E5=88=9A=E4=B8=8D=E5=B0=8F=E5=BF=83commit?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                       |   1 +
 .../66511fb14e039e093b9f19d44c67f992.png         |   0
 .../75aa1ba23140193b469f1e341b70d259.png         |   0
 .../afd66491faa7bc71504bbebbf2472c6a.png         | Bin 1997 -> 0 bytes
 .../b06f164d2be39b9d00856667bf5f298a.png         |   0
 .../efe52ca24ac21daeb27249021854b806.png         |   0
 6 files changed, 1 insertion(+)
 delete mode 100644 static/src/upload_image/66511fb14e039e093b9f19d44c67f992.png
 delete mode 100644 static/src/upload_image/75aa1ba23140193b469f1e341b70d259.png
 delete mode 100644 static/src/upload_image/afd66491faa7bc71504bbebbf2472c6a.png
 delete mode 100644 static/src/upload_image/b06f164d2be39b9d00856667bf5f298a.png
 delete mode 100644 static/src/upload_image/efe52ca24ac21daeb27249021854b806.png

diff --git a/.gitignore b/.gitignore
index 285cfd8..1fbe8ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@ log/
 static/release/css
 static/release/js
 static/release/img
+static/src/upload_image/*
 build.txt
 tmp/
 test_case/
\ No newline at end of file
diff --git a/static/src/upload_image/66511fb14e039e093b9f19d44c67f992.png b/static/src/upload_image/66511fb14e039e093b9f19d44c67f992.png
deleted file mode 100644
index e69de29..0000000
diff --git a/static/src/upload_image/75aa1ba23140193b469f1e341b70d259.png b/static/src/upload_image/75aa1ba23140193b469f1e341b70d259.png
deleted file mode 100644
index e69de29..0000000
diff --git a/static/src/upload_image/afd66491faa7bc71504bbebbf2472c6a.png b/static/src/upload_image/afd66491faa7bc71504bbebbf2472c6a.png
deleted file mode 100644
index 2fcf1764beee466fde889375dd47f801f7fea3f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1997
zcmdT_do<hG7B+*SR8&#%%=EEpq+aQ?sfv^!jFF0BFk(EKax*jukxW!PS~I9yk7}!0
z+O&$IZ5SFfo>!->s$|F@#v?+DAjBgjBaxb)`TPET*Sc%%bN1P1?RECI&ffdmx&D6M
zdOBu0YHDhFKHqo-0D22pquQSXJMqeAYk*Qua`y?+*47@M#!dmIDHR<`4J5}>>Cu!J
zwSSSw#2C9IJS8TEltds?SJb=CsHtg1`FNs&lJ6}Gk%Yh>EPB?G;^Uzwy<nh21X@6M
zxu=PBZRVGLXpKmNdqx^s2CrYEg2F9=66TLkYp99Wp?`gD>AYB(&prgw%mQWd&zo_-
zo)GsM#+OaB-%paN(p&?trcmNKRpPm<iHG6#=5B5!5<Rus1I|JJd!e>Xx-Ds<_C-uR
zd&|^)kuz4czvIVWm5Ukk!HxK+x|XxFudc1L#;@xaZOM*}9Ar;gp;mhi&pi66%xa5p
zIE?%=x_pPoDZ<L({8r*g5N+UG``n*TT0J_lDI6}LC0kIQDZu^l&OaxHJ?Y|JXcCsA
z6Gq<ef&7VJ`Dt-^SugWT?aag81z`O8R_f84oWu{=u(|iIuXSet_O0RMv<}m~wD?V_
zkRhGm*x{PN_yY$H%!$RiS(&i8q1wPU`ihmgIb(gs=T#M<Bl;K8pn!$LGF?m~CY$0z
z%Kbw*lq%TKlD=6AC-n@ZgH{l|uXlAd0gLS)sgLYuBHPkcil+Dx5D3(nrfgm}A&ELI
zHM+T6%xtNNLxcuub#?kT^s#%VlVXLfw5K8UlU*4*LqkJK`HH@!Gdq@7dJ&E|apD95
z(KcZf8yg!?J5+ouq*Q5eN0NWeYOyNdM^R^*IsD=aAWREcB%SPFtWI?=EG%G-4i4yy
zHxt_~$>wtOAyQFS#$T(`?&Xe-jtLS03-Dmbr92+*ECxe8zr!y0;==P$0C9b2!%Og>
zNR*-YxFGI-070glQ0S;sD(r(ZdJg?OUVdKQUJ$6DurLRrr&youo1dRwT3UL1wrs5P
zQbDxYLzf|so&rl<k5g}!MxXb9Wm__Fb}-n?>`Ay480`4Q!Zp2p-Sow3sn<x}RYAoe
zDxN#XD?3)gU@-DwUFoVgLRP-{sbKr+02@4JLtDSz=D;;OX_60sk4it4Fo1&=KYBJW
zP|A9^@eO#9mgS%sTsUJ^U*m+5Y#5{%O^+kVlkK(PU&G;ZB!ur24b1MjqOR3Ax>V&`
z(wVWt?7d*+n!YU+B1Xy->Pa1->=e(tnAp_RQ~-2HeFQS&Q)*<SXlCXD7F#Gu`_87~
zsO}D$IibtESP=#-c20cnnctPLJa!V#9U2O{HSCmKn^i6iuML74=?I0wY2SOsug^Dx
z+S=RNdPe>me<#MERo~0odvJj|`ytY}#39nJdXO%i$n7+uiyNOcNqZfNt;cKNr%!Jw
z<zzetUMB2JV{Aau6d!BXOJnUza7}UF35VO2YcA2U0{M~S*k=A|i{IQdSq=x+4E+pQ
z4qo#<Xo){ck`Yy74Q6?0u9SW1pY|8`)!IeX?es;@Gc8VDYRvyVx=#6$7^kCe%cbFy
zzkPCLw`WWjp_MrOuGwLN1<PH^S-4RhUP;sJB_rS2RQAmt_dcFm!WEP`McQ+$BPd~H
zRqDVD^CFCdeAm6l-{83b2bpYwjTzd0!J@aWpx+{Ew}~A$oJPy-wu!>%_j#M1H_}Dy
zY)AS?n;U`;@Q$Jpyu8Ol(sZ41V<5$Hh6!eajM)*83Zy9kxu1end&+W6`B+n5zcTzZ
z1Wq>6{+_4;>Q5$<<ue!lG|bz4@m%GX+z`4Kt1t_+R4iSV6&`UCUDga1D}Zi;7N=}3
z-Q}4R9Ue1M*CvdhK&R$y-g&eUd!1pi8$IPFc)7tt!aFQaE~nKz+_>#HhW|x?LrW7;
z5~7>5A*yKu;+hV|AHSQ&GuL##-3ghS?JEJUQdg%?&i5xdN!9nwn{w-Ktv#sXoPog-
zr(b5()zuXh6;=LDE4bj&^Hp5+WA8RukA~R%*URF^%dZG>Q&x*9hjDH9ug44dQtPl4
zZHjy!i>|{_{zF=bt9+?(*orMht_5U{MYpIB8nQ|19OY$!-9fsTU<oA%t-RWBY?3ht
z;kldTX4u#d<ut9g!achrNB@~mg0K)C(%bx2-x-qO?jwjdyNoFG-8Lazdie*vMDgb4
zxo>CTxy>Y(dG1ZoDa(JV2XOrV5Oj+~&&g2Zip1_eP`;pVwh=hM`2yst5149AjMLRA
fj?I6cXxr+@{Vx5L_UZe8fvo0(_VcWBkIMWTEfv!^

diff --git a/static/src/upload_image/b06f164d2be39b9d00856667bf5f298a.png b/static/src/upload_image/b06f164d2be39b9d00856667bf5f298a.png
deleted file mode 100644
index e69de29..0000000
diff --git a/static/src/upload_image/efe52ca24ac21daeb27249021854b806.png b/static/src/upload_image/efe52ca24ac21daeb27249021854b806.png
deleted file mode 100644
index e69de29..0000000

From 74f122b472415dc0de9a20e7aadb6e8f656b9083 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sat, 12 Sep 2015 09:54:47 +0800
Subject: [PATCH 32/38] =?UTF-8?q?=E4=BF=AE=E6=AD=A3server=5Fsetting?=
 =?UTF-8?q?=E4=B8=ADtypo=E5=92=8Curls=E9=87=8C=E5=88=AB=E6=89=AD=E7=9A=84?=
 =?UTF-8?q?=E6=8B=BC=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oj/server_settings.py         | 2 +-
 oj/urls.py                    | 2 +-
 static/src/js/utils/editor.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/oj/server_settings.py b/oj/server_settings.py
index 916f143..a00d7bb 100644
--- a/oj/server_settings.py
+++ b/oj/server_settings.py
@@ -36,4 +36,4 @@ TEST_CASE_DIR = '/root/test_case/'
 
 ALLOWED_HOSTS = ['*']
 
-IMAGE_UPLOAD_DIR = '/var/mnt/source/OnlineJudeg/static/src/upload_image/'
+IMAGE_UPLOAD_DIR = '/var/mnt/source/OnlineJudge/static/src/upload_image/'
diff --git a/oj/urls.py b/oj/urls.py
index 20d3142..e9cc880 100644
--- a/oj/urls.py
+++ b/oj/urls.py
@@ -54,7 +54,7 @@ urlpatterns = [
     url(r'^api/submission/$', SubmissionAPIView.as_view(), name="submission_api"),
     url(r'^api/group_join/$', JoinGroupAPIView.as_view(), name="group_join_api"),
 
-    url(r'^api/admin/up_load_image/$', SimditorImageUploadAPIView.as_view(), name="simditor_upload_image"),
+    url(r'^api/admin/upload_image/$', SimditorImageUploadAPIView.as_view(), name="simditor_upload_image"),
     url(r'^api/admin/announcement/$', AnnouncementAdminAPIView.as_view(), name="announcement_admin_api"),
     url(r'^api/admin/contest/$', ContestAdminAPIView.as_view(), name="contest_admin_api"),
     url(r'^api/admin/user/$', UserAdminAPIView.as_view(), name="user_admin_api"),
diff --git a/static/src/js/utils/editor.js b/static/src/js/utils/editor.js
index 03ee16c..53a7d55 100644
--- a/static/src/js/utils/editor.js
+++ b/static/src/js/utils/editor.js
@@ -8,7 +8,7 @@ define("editor", ["simditor"], function(Simditor){
             toolbarFloat: false,
             defaultImage: null,
             upload: {
-                url: "/api/admin/up_load_image/",
+                url: "/api/admin/upload_image/",
                 params: null,
                 fileKey: "image",
                 connectionCount: 3,

From d06096b19b11161f6bf86f9efa350076dcda3d84 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sat, 12 Sep 2015 11:33:47 +0800
Subject: [PATCH 33/38] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=AF=94=E8=B5=9B=EF=BC=8C=E7=BC=96=E8=BE=91=E6=AF=94=E8=B5=9B?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=B0=8F=E7=BB=84=E5=8F=AF=E8=A7=81?=
 =?UTF-8?q?=E7=9A=84=E4=BA=A4=E4=BA=92=E9=80=BB=E8=BE=91=E5=92=8C=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/contest/addContest.js | 165 ++++---
 .../src/js/app/admin/contest/contestList.js   | 409 ++++++++----------
 template/src/admin/contest/add_contest.html   |  31 +-
 template/src/admin/contest/contest_list.html  |  41 +-
 4 files changed, 315 insertions(+), 331 deletions(-)

diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js
index e1c8b54..44ac824 100644
--- a/static/src/js/app/admin/contest/addContest.js
+++ b/static/src/js/app/admin/contest/addContest.js
@@ -3,7 +3,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
     function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
 
         $("#add-contest-form").validator().on('submit', function (e) {
-            if (!e.isDefaultPrevented()){
+            if (!e.isDefaultPrevented()) {
                 e.preventDefault();
                 var ajaxData = {
                     title: vm.title,
@@ -16,25 +16,32 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                     end_time: vm.endTime,
                     visible: false
                 };
-                if (vm.choseGroupList.length == 0) {
-                   bsAlert("你没有选择参赛用户!");
-                   return false;
+
+                var selectedGroups = [];
+                if (!vm.isGlobal) {
+                    for (var i = 0; i < vm.allGroups.length; i++) {
+                        if (vm.allGroups[i].isSelected) {
+                            selectedGroups.push(vm.allGroups[i].id);
+                        }
+                    }
+                    ajaxData.groups = selectedGroups;
                 }
-                if (vm.choseGroupList[0].id == 0) { //everyone | public contest
+                else {
                     if (vm.password) {
                         ajaxData.password = vm.password;
                         ajaxData.contest_type = 2;
                     }
-                    else{
+                    else
                         ajaxData.contest_type = 1;
-                    }
                 }
-                else { // Add groups info
-                    ajaxData.groups = [];
-                    for (var i = 0; vm.choseGroupList[i]; i++)
-                        ajaxData.groups.push(parseInt(vm.choseGroupList[i].id))
+                if (!vm.isGlobal && !selectedGroups.length) {
+                    bsAlert("你没有选择参赛用户!");
+                    return false;
+                }
+                if (vm.editDescription == "") {
+                    bsAlert("比赛描述不能为空!");
+                    return false;
                 }
-
                 $.ajax({                                  // Add contest
                     beforeSend: csrfTokenHeader,
                     url: "/api/admin/contest/",
@@ -44,20 +51,19 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                     method: "post",
                     success: function (data) {
                         if (!data.code) {
-                                bsAlert("添加成功！将转到比赛列表页以便为比赛添加问题(注意比赛当前状态为:隐藏)");
-                                vm.title          = "";
-                                vm.description    = "";
-                                vm.startTime      = "";
-                                vm.endTime        = "";
-                                vm.password       = "";
-                                vm.mode           = "";
-                                vm.hideRank       = 0;
-                                vm.showSubmission = false;
-                                vm.group          = "-1";
-                                vm.groupList      = [];
-                                vm.choseGroupList = [];
-                                vm.passwordUsable = false;
-                                location.hash = "#contest/contest_list";
+                            bsAlert("添加成功！将转到比赛列表页以便为比赛添加问题(注意比赛当前状态为:隐藏)");
+                            vm.title = "";
+                            vm.description = "";
+                            vm.startTime = "";
+                            vm.endTime = "";
+                            vm.password = "";
+                            vm.mode = "";
+                            vm.hideRank = 0;
+                            vm.showSubmission = false;
+                            location.hash = "#contest/contest_list";
+                            vm.isGlobal = true;
+                            vm.allGroups = [];
+                            vm.showGlobalViewRadio = true;
                         }
                         else {
                             bsAlert(data.data);
@@ -69,80 +75,59 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
         });
 
         editor("#editor");
-    if (avalon.vmodels.add_contest)
-        var vm = avalon.vmodels.add_contest;
-    else
-        var vm = avalon.define({
-            $id: "add_contest",
-            title: "",
-            description: "",
-            startTime: "",
-            endTime: "",
-            password: "",
-            mode: "",
-            hideRank: 0,
-            showSubmission: false,
-            group: "-1",
-            groupList: [],
-            choseGroupList: [],
-            passwordUsable: false,
-            addGroup: function() {
-                if (vm.group == -1) return;
-                if (vm.groupList[vm.group].id == 0){
-                    vm.passwordUsable = true;
-                    vm.choseGroupList = [];
-                    for (var key in vm.groupList){
-                        vm.groupList[key].chose = true;
-                    }
-                }
-                vm.groupList[vm.group]. chose = true;
-                vm.choseGroupList.push({name:vm.groupList[vm.group].name, index:vm.group, id:vm.groupList[vm.group].id});
-                vm.group = -1;
-            },
-            removeGroup: function(groupIndex){
-                if (vm.groupList[vm.choseGroupList[groupIndex].index].id == 0){
-                    vm.passwordUsable = false;
-                    for (key in vm.groupList){
-                        vm.groupList[key].chose = false;
-                    }
-                }
-                vm.groupList[vm.choseGroupList[groupIndex].index].chose = false;
-                vm.choseGroupList.remove(vm.choseGroupList[groupIndex]);
-            }
-        });
+        if (avalon.vmodels.add_contest)
+            var vm = avalon.vmodels.add_contest;
+        else
+            var vm = avalon.define({
+                $id: "add_contest",
+                title: "",
+                description: "",
+                startTime: "",
+                endTime: "",
+                password: "",
+                mode: "",
+                hideRank: 0,
+                showSubmission: false,
+                isGlobal: true,
+                allGroups: [],
+                showGlobalViewRadio: true
+            });
 
-        $.ajax({  // Get current user type
+        $.ajax({
             url: "/api/user/",
             method: "get",
             dataType: "json",
             success: function (data) {
                 if (!data.code) {
-                    if (data.data.admin_type == 2) { // Is super user
-                        vm.isGlobal = true;
-                        vm.groupList.push({id:0,name:"所有人",chose:false});
+                    var admin_type = data.data.admin_type;
+                    if (data.data.admin_type == 1) {
+                        vm.isGlobal = false;
+                        vm.showGlobalViewRadio = false;
+
                     }
-                    $.ajax({      // Get the group list of current user
-                        beforeSend: csrfTokenHeader,
-                        url: "/api/admin/group/",
-                        method: "get",
-                        dataType: "json",
-                        success: function (data) {
-                            if (!data.code) {
-                                if (!data.data.length) {
-                                    return;
-                                }
-                                for (var i = 0; i < data.data.length; i++) {
-                                    var item = data.data[i];
-                                    item["chose"] = false;
-                                    vm.groupList.push(item);
-                                }
+                }
+                $.ajax({
+                    url: "/api/admin/group/",
+                    method: "get",
+                    dataType: "json",
+                    success: function (data) {
+                        if (!data.code) {
+                            if (!data.data.length) {
+                                if (admin_type != 2)
+                                    bsAlert("您的用户权限只能创建小组内比赛，但是您还没有创建过小组");
+                                return;
                             }
-                            else {
-                                bsAlert(data.data);
+                            for (var i = 0; i < data.data.length; i++) {
+                                var item = data.data[i];
+                                item["isSelected"] = false;
+                                vm.allGroups.push(item);
                             }
                         }
-                    });
-                }
+                        else {
+                            bsAlert(data.data);
+                        }
+                    }
+                });
             }
         });
 
diff --git a/static/src/js/app/admin/contest/contestList.js b/static/src/js/app/admin/contest/contestList.js
index cabf4d0..58f6196 100644
--- a/static/src/js/app/admin/contest/contestList.js
+++ b/static/src/js/app/admin/contest/contestList.js
@@ -3,21 +3,39 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
     avalon.ready(function () {
 
         $("#edit-contest-form").validator().on('submit', function (e) {
-            if (!e.isDefaultPrevented()){
+            if (!e.isDefaultPrevented()) {
                 e.preventDefault();
                 var ajaxData = {
-                    id:                   vm.contestList[vm.editingContestId-1].id,
-                    title:                vm.editTitle,
-                    description:          vm.editDescription,
-                    mode:                 vm.editMode,
-                    contest_type:         0,
-                    hide_rank:            vm.editHideRank,
+                    id: vm.contestList[vm.editingContestId - 1].id,
+                    title: vm.editTitle,
+                    description: vm.editDescription,
+                    mode: vm.editMode,
+                    contest_type: 0,
+                    hide_rank: vm.editHideRank,
                     show_user_submission: vm.editShowSubmission,
-                    start_time:           vm.editStartTime,
-                    end_time:             vm.editEndTime,
-                    visible:              vm.editVisible
+                    start_time: vm.editStartTime,
+                    end_time: vm.editEndTime,
+                    visible: vm.editVisible
                 };
-                if (vm.choseGroupList.length == 0) {
+
+                var selectedGroups = [];
+                if (!vm.isGlobal) {
+                    for (var i = 0; i < vm.allGroups.length; i++) {
+                        if (vm.allGroups[i].isSelected) {
+                            selectedGroups.push(vm.allGroups[i].id);
+                        }
+                    }
+                    ajaxData.groups = selectedGroups;
+                }
+                else {
+                    if (vm.password) {
+                        ajaxData.password = vm.editPassword;
+                        ajaxData.contest_type = 2;
+                    }
+                    else
+                        ajaxData.contest_type = 1;
+                }
+                if (!vm.isGlobal && !selectedGroups.length) {
                     bsAlert("你没有选择参赛用户!");
                     return false;
                 }
@@ -25,22 +43,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                     bsAlert("比赛描述不能为空!");
                     return false;
                 }
-                if (vm.choseGroupList[0].id == 0) { //everyone | public contest
-                    if (vm.editPassword) {
-                        ajaxData.password = vm.editPassword;
-                        ajaxData.contest_type = 2;
-                    }
-                    else{
-                        ajaxData.contest_type = 1;
-                    }
-                }
-                else { // Add groups info
-                    ajaxData.groups = [];
-                    for (var i = 0; vm.choseGroupList[i]; i++)
-                        ajaxData.groups.push(parseInt(vm.choseGroupList[i].id))
-                }
 
-                $.ajax({                                  // Add contest
+                $.ajax({                                  // modify contest info
                     beforeSend: csrfTokenHeader,
                     url: "/api/admin/contest/",
                     dataType: "json",
@@ -52,7 +56,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                         if (!data.code) {
                             bsAlert("修改成功!");
                             vm.editingContestId = 0; // Hide the editor
-							vm.getPage(1);           // Refresh the contest list
+                            vm.getPage(1);           // Refresh the contest list
                         }
                         else {
                             bsAlert(data.data);
@@ -63,138 +67,124 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
             return false;
         });
 
-    if(avalon.vmodels.contestList){
-        // this page has been loaded before, so set the default value
-        var vm = avalon.vmodels.contestList;
-        vm.contestList= [];
-        vm.previousPage= 0;
-        vm.nextPage= 0;
-        vm.page= 1;
-        vm.totalPage= 1;
-        vm.group= "-1";
-        vm.groupList= [];
-        vm.choseGroupList= [];
-        vm.passwordUsable= false;
-        vm.keyword= "";
-        vm.editingContestId= 0;
-        vm.editTitle= "";
-        vm.editDescription= "";
-        vm.editProblemList= [];
-        vm.editPassword= "";
-        vm.editStartTime= "";
-        vm.editEndTime= "";
-        vm.editMode= "";
-        vm.editHideRank= 0;
-        vm.editShowSubmission= false;
-        vm.editProblemList= [];
-        vm.editVisible= false;
-        vm.editChoseGroupList= [];
-        vm.editingProblemContestIndex= 0;
-    }
-    else {
-        var vm = avalon.define({
-            $id: "contestList",
-            contestList: [],
-            previousPage: 0,
-            nextPage: 0,
-            page: 1,
-            totalPage: 1,
-            showVisibleOnly: false,
-            group: "-1",
-            groupList: [],
-            choseGroupList: [],
-            passwordUsable: false,
-            keyword: "",
-            editingContestId: 0,
-            editTitle: "",
-            editDescription: "",
-            editProblemList: [],
-            editPassword: "",
-            editStartTime: "",
-            editEndTime: "",
-            editMode: "",
-            editHideRank: false,
-            editShowSubmission: false,
-            editProblemList: [],
-            editVisible: false,
-            editChoseGroupList: [],
-            editingProblemContestIndex: 0,
-            getNext: function () {
-                if (!vm.nextPage)
-                    return;
-                getPageData(vm.page + 1);
-            },
-            getPrevious: function () {
-                if (!vm.previousPage)
-                    return;
-                getPageData(vm.page - 1);
-            },
-            getBtnClass: function (btn) {
-                if (btn == "next") {
-                    return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled";
-                }
-                else {
-                    return vm.previousPage ? "btn btn-primary" : "btn btn-primary disabled";
-                }
-            },
-            getPage: function (page_index) {
-                getPageData(page_index);
-            },
-            showEditContestArea: function (contestId) {
-                if (vm.editingContestId && !confirm("如果继续将丢失未保存的信息,是否继续?"))
-                    return;
-                if (contestId == vm.editingContestId)
-                    vm.editingContestId = 0;
-                else {
-                    vm.editingContestId = contestId;
-                    vm.editTitle     = vm.contestList[contestId-1].title;
-                    vm.editPassword  = vm.contestList[contestId-1].password;
-                    vm.editStartTime = vm.contestList[contestId-1].start_time.substring(0,16).replace("T"," ");
-                    vm.editEndTime   = vm.contestList[contestId-1].end_time.substring(0,16).replace("T"," ");
-                    vm.editMode      = vm.contestList[contestId-1].mode;
-                    vm.editVisible      = vm.contestList[contestId-1].visible;
-                    if (vm.contestList[contestId-1].contest_type == 0) { //contest type == 0, contest in group
-                        //Clear the choseGroupList
-                        while (vm.choseGroupList.length) {
-                            vm.removeGroup(0);
-                        }
+        if (avalon.vmodels.contestList) {
+            // this page has been loaded before, so set the default value
+            var vm = avalon.vmodels.contestList;
+            vm.contestList = [];
+            vm.previousPage = 0;
+            vm.nextPage = 0;
+            vm.page = 1;
+            vm.totalPage = 1;
+            vm.keyword = "";
+            vm.editingContestId = 0;
+            vm.editTitle = "";
+            vm.editDescription = "";
+            vm.editProblemList = [];
+            vm.editPassword = "";
+            vm.editStartTime = "";
+            vm.editEndTime = "";
+            vm.editMode = "";
+            vm.editHideRank = 0;
+            vm.editShowSubmission = false;
+            vm.editVisible = false;
+            vm.editingProblemContestIndex = 0;
+        }
+        else {
+            var vm = avalon.define({
+                $id: "contestList",
+                contestList: [],
+                previousPage: 0,
+                nextPage: 0,
+                page: 1,
+                totalPage: 1,
+                showVisibleOnly: false,
+                keyword: "",
+                editingContestId: 0,
+                editTitle: "",
+                editDescription: "",
+                editProblemList: [],
+                editPassword: "",
+                editStartTime: "",
+                editEndTime: "",
+                editMode: "",
+                editHideRank: false,
+                editShowSubmission: false,
+                editVisible: false,
+                editingProblemContestIndex: 0,
+                isGlobal: true,
+                allGroups: [],
+                showGlobalViewRadio: true,
 
-                        for (var i = 0; i < vm.contestList[contestId-1].groups.length; i++){
-                            var id = parseInt(vm.contestList[contestId-1].groups[i]);
-                            var index = 0;
-                            for (; vm.groupList[index]; index++) {
-                                if (vm.groupList[index].id == id)
-                                    break;
+                getNext: function () {
+                    if (!vm.nextPage)
+                        return;
+                    getPageData(vm.page + 1);
+                },
+                getPrevious: function () {
+                    if (!vm.previousPage)
+                        return;
+                    getPageData(vm.page - 1);
+                },
+                getBtnClass: function (btn) {
+                    if (btn == "next") {
+                        return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled";
+                    }
+                    else {
+                        return vm.previousPage ? "btn btn-primary" : "btn btn-primary disabled";
+                    }
+                },
+                getPage: function (page_index) {
+                    getPageData(page_index);
+                },
+                showEditContestArea: function (contestId) {
+                    if (vm.editingContestId && !confirm("如果继续将丢失未保存的信息,是否继续?"))
+                        return;
+                    if (contestId == vm.editingContestId)
+                        vm.editingContestId = 0;
+                    else {
+                        vm.editingContestId = contestId;
+                        vm.editTitle = vm.contestList[contestId - 1].title;
+                        vm.editPassword = vm.contestList[contestId - 1].password;
+                        vm.editStartTime = vm.contestList[contestId - 1].start_time.substring(0, 16).replace("T", " ");
+                        vm.editEndTime = vm.contestList[contestId - 1].end_time.substring(0, 16).replace("T", " ");
+                        vm.editMode = vm.contestList[contestId - 1].mode;
+                        vm.editVisible = vm.contestList[contestId - 1].visible;
+                        if (vm.contestList[contestId - 1].contest_type == 0) { //contest type == 0, contest in group
+                            vm.isGlobal = false;
+                            for (var i = 0; i < vm.allGroups.length; i++) {
+                                vm.allGroups[i].isSelected = false;
+                            }
+                            for (var i = 0; i < vm.contestList[contestId - 1].groups.length; i++) {
+                                var id = parseInt(vm.contestList[contestId - 1].groups[i]);
+
+                                for (var index = 0; vm.allGroups[index]; index++) {
+                                    if (vm.allGroups[index].id == id) {
+                                        vm.allGroups[index].isSelected = true;
+                                        break;
+                                    }
+                                }
                             }
-                            vm.groupList[index].chose = true;
-                            vm.choseGroupList.push({
-                                name:vm.groupList[index].name,
-                                index:index,
-                                id:id
-                            });
                         }
+                        else {
+                            vm.isGlobal = true;
+                        }
+                        vm.editHideRank = vm.contestList[contestId - 1].Hide_rank;
+                        vm.editShowSubmission = vm.contestList[contestId - 1].show_user_submission;
+                        editor("#editor").setValue(vm.contestList[contestId - 1].description);
+                        vm.editingProblemContestIndex = 0;
                     }
-                    else{
-                        vm.group = "0";
-                        vm.addGroup()//vm.editChoseGroupList = [0]; id 0 is for the group of everyone~
+                },
+                showEditProblemArea: function (contestId) {
+                    if (vm.editingProblemContestIndex == contestId) {
+                        vm.editingProblemContestIndex = 0;
+                        return;
                     }
-                    vm.editHideRank = vm.contestList[contestId-1].Hide_rank;
-                    vm.editShowSubmission = vm.contestList[contestId-1].show_user_submission;
-                    editor("#editor").setValue(vm.contestList[contestId-1].description);
-                    vm.editingProblemContestIndex = 0;
-                }
-            },
-            showEditProblemArea: function(contestId) {
-                if (vm.editingProblemContestIndex == contestId) {
-                    vm.editingProblemContestIndex = 0;
-                    return;
-                }
-                if (vm.editingContestId&&!confirm("如果继续将丢失未保存的信息,是否继续?")){
-                    return;
-                }
-                $.ajax({      // Get the problem list of current contest
+                    if (vm.editingContestId && !confirm("如果继续将丢失未保存的信息,是否继续?")) {
+                        return;
+                    }
+                    $.ajax({      // Get the problem list of current contest
                         beforeSend: csrfTokenHeader,
-                        url: "/api/admin/contest_problem/?contest_id=" + vm.contestList[contestId-1].id,
+                        url: "/api/admin/contest_problem/?contest_id=" + vm.contestList[contestId - 1].id,
                         method: "get",
                         dataType: "json",
                         success: function (data) {
@@ -206,51 +196,27 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                             }
                         }
                     });
-                vm.editingContestId = 0;
-                vm.editingProblemContestIndex = contestId;
-                vm.editMode = vm.contestList[contestId-1].mode;
-            },
-            addGroup: function() {
-                    if (vm.group == -1) return;
-                    if (vm.groupList[vm.group].id == 0){
-                        vm.passwordUsable = true;
-                        vm.choseGroupList = [];
-                        for (var i = 0; i < vm.groupList.length; i++) {
-                            vm.groupList[i].chose = true;
-                        }
-                    }
-                    vm.groupList[vm.group]. chose = true;
-                    // index of the group is relative. It is related to user
-                    vm.choseGroupList.push({name:vm.groupList[vm.group].name, index:vm.group, id:vm.groupList[vm.group].id});
-                    vm.group = -1;
-            },
-            removeGroup: function(groupIndex){
-                    if (vm.groupList[vm.choseGroupList[groupIndex].index].id == 0){
-                        vm.passwordUsable = false;
-                        for (var i = 0; i < vm.groupList.length; i++) {
-                            vm.groupList[i].chose = false;
-                        }
-                    }
-                    vm.groupList[vm.choseGroupList[groupIndex].index].chose = false;
-                    vm.choseGroupList.remove(vm.choseGroupList[groupIndex]);
+                    vm.editingContestId = 0;
+                    vm.editingProblemContestIndex = contestId;
+                    vm.editMode = vm.contestList[contestId - 1].mode;
                 },
-            addProblem: function () {
-                vm.$fire("up!showContestProblemPage", 0, vm.contestList[vm.editingProblemContestIndex-1].id, vm.editMode);
-            },
-            showProblemEditPage: function(el) {
-                vm.$fire("up!showContestProblemPage", el.id, vm.contestList[vm.editingProblemContestIndex-1].id, vm.editMode);
-            },
-            showSubmissionPage: function(el) {
-                var problemId = 0
-                if (el)
-                    problemId = el.id;
-                vm.$fire("up!showContestSubmissionPage", problemId, vm.contestList[vm.editingProblemContestIndex-1].id, vm.editMode);
-            }
-        });
-        vm.$watch("showVisibleOnly", function() {
-            getPageData(1);
-        })
-    }
+                addProblem: function () {
+                    vm.$fire("up!showContestProblemPage", 0, vm.contestList[vm.editingProblemContestIndex - 1].id, vm.editMode);
+                },
+                showProblemEditPage: function (el) {
+                    vm.$fire("up!showContestProblemPage", el.id, vm.contestList[vm.editingProblemContestIndex - 1].id, vm.editMode);
+                },
+                showSubmissionPage: function (el) {
+                    var problemId = 0
+                    if (el)
+                        problemId = el.id;
+                    vm.$fire("up!showContestSubmissionPage", problemId, vm.contestList[vm.editingProblemContestIndex - 1].id, vm.editMode);
+                }
+            });
+            vm.$watch("showVisibleOnly", function () {
+                getPageData(1);
+            })
+        }
         getPageData(1);
 
         //init time picker
@@ -293,39 +259,40 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
         }
 
         // Get group list
-        $.ajax({  // Get current user type
+        $.ajax({
             url: "/api/user/",
             method: "get",
             dataType: "json",
             success: function (data) {
                 if (!data.code) {
-                    if (data.data.admin_type == 2) { // Is super user
-                        vm.isGlobal = true;
-						vm.groupList.push({id:0,name:"所有人",chose:false});
+                    var admin_type = data.data.admin_type;
+                    if (data.data.admin_type == 1) {
+                        vm.isGlobal = false;
+                        vm.showGlobalViewRadio = false;
                     }
-                    $.ajax({      // Get the group list of current user
-                        beforeSend: csrfTokenHeader,
-                        url: "/api/admin/group/",
-                        method: "get",
-                        dataType: "json",
-                        success: function (data) {
-                            if (!data.code) {
-                                if (!data.data.length) {
-                                    //this user have no group can use
-                                    return;
-                                }
-                                for (var i = 0; i < data.data.length; i++) {
-                                    var item = data.data[i];
-                                    item["chose"] = false;
-                                    vm.groupList.push(item);
-                                }
+                }
+                $.ajax({
+                    url: "/api/admin/group/",
+                    method: "get",
+                    dataType: "json",
+                    success: function (data) {
+                        if (!data.code) {
+                            if (!data.data.length) {
+                                if (admin_type != 2)
+                                    bsAlert("您的用户权限只能创建小组内比赛，但是您还没有创建过小组");
+                                return;
                             }
-                            else {
-                                bsAlert(data.data);
+                            for (var i = 0; i < data.data.length; i++) {
+                                var item = data.data[i];
+                                item["isSelected"] = false;
+                                vm.allGroups.push(item);
                             }
                         }
-                    });
-                }
+                        else {
+                            bsAlert(data.data);
+                        }
+                    }
+                });
             }
         });
 
diff --git a/template/src/admin/contest/add_contest.html b/template/src/admin/contest/add_contest.html
index 9ea2b5f..fd4ed11 100644
--- a/template/src/admin/contest/add_contest.html
+++ b/template/src/admin/contest/add_contest.html
@@ -45,22 +45,37 @@
                 </div>
             </div>
             <div class="col-md-6">
-                <label>允许参加的用户</label>
                 <div class="form-group">
-                    <select class="form-control" ms-duplex="group" ms-change="addGroup" value="-1">
-                        <option value="-1">请选择</option>
-                        <option ms-repeat="groupList" ms-attr-value="$index" ms-visible="!el.chose">{{el.name}}</option>
-                    </select>
+                    <label>可见范围</label>
+
+                    <div>
+                <span ms-if="showGlobalViewRadio">
+                    <label>
+                        <small><input type="radio" value="true" name="isGlobal" ms-duplex-boolean="isGlobal">全局可见
+                        </small>
+                    </label>
+                </span>
+                <span>
+                    <label>
+                        <small><input type="radio" value="false" name="isGlobal" ms-duplex-boolean="isGlobal">小组内可见
+                        </small>
+                    </label>
+                </span>
+                    </div>
+
                 </div>
             </div>
-            <div class="col-md-6" ms-visible="passwordUsable">
+            <div class="col-md-6" ms-visible="isGlobal">
                 <label>密码保护</label>
                 <div class="form-group">
                     <input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="password">
                 </div>
             </div>
-            <div class="col-md-12">
-                <div ms-repeat="choseGroupList" class="group-tag" ms-click="removeGroup($index)">{{el.name}}</div>
+            <div class="form-group col-md-12" ms-visible="!isGlobal">
+                <!-- radio 的value 没有用 但是没有的话，表单验证会出错-->
+                <div ms-repeat="allGroups" class="col-md-4">
+                    <input type="checkbox" value="group_id" ms-duplex-checked="el.isSelected">&nbsp;&nbsp;{{ el.name }}
+                </div>
             </div>
             <div class="col-md-3">
                 <label>排名方式</label>
diff --git a/template/src/admin/contest/contest_list.html b/template/src/admin/contest/contest_list.html
index 99c54fe..40fd104 100644
--- a/template/src/admin/contest/contest_list.html
+++ b/template/src/admin/contest/contest_list.html
@@ -63,7 +63,7 @@
                     <textarea id="editor" placeholder="这里输入内容" autofocus ms-duplex="editDescription"></textarea>
 
                     <div class="help-block with-errors"></div>
-                    <p class="error-info" ms-visible="editDescription==''" >请填写比赛描述</p>
+                    <p class="error-info" ms-visible="editDescription==''">请填写比赛描述</p>
                 </div>
             </div>
             <div class="col-md-4">
@@ -88,29 +88,46 @@
             </div>
             <div class="col-md-3">
                 <label>封榜时间(结束前/min)</label>
+
                 <div class="form-group">
                     <input class="form-control" ms-duplex="editHideRank" type="number" data-error="请填写封榜时间" required>
+
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
             <div class="col-md-6">
-                <label>允许参加的用户</label>
-
                 <div class="form-group">
-                    <select class="form-control" ms-duplex="group" ms-change="addGroup" value="-1">
-                        <option value="-1">请选择</option>
-                        <option ms-repeat="groupList" ms-attr-value="$index" ms-visible="!el.chose">{{el.name}}</option>
-                    </select>
+                    <label>可见范围</label>
+
+                    <div>
+                <span ms-if="showGlobalViewRadio">
+                    <label>
+                        <small><input type="radio" value="true" name="isGlobal" ms-duplex-boolean="isGlobal">全局可见
+                        </small>
+                    </label>
+                </span>
+                <span>
+                    <label>
+                        <small><input type="radio" value="false" name="isGlobal" ms-duplex-boolean="isGlobal">小组内可见
+                        </small>
+                    </label>
+                </span>
+                    </div>
+
                 </div>
+
             </div>
-            <div class="col-md-6" ms-visible="passwordUsable">
+            <div class="col-md-6" ms-visible="isGlobal">
                 <label>密码保护</label>
                 <input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="editPassword">
             </div>
-            <div class="col-md-12">
-                <div ms-repeat="choseGroupList" class="group-tag" ms-click="removeGroup($index)">{{el.name}}</div>
+            <div class="form-group col-md-12" ms-visible="!isGlobal">
+                <!-- radio 的value 没有用 但是没有的话，表单验证会出错-->
+                <div ms-repeat="allGroups" class="col-md-4">
+                    <input type="checkbox" value="group_id" ms-duplex-checked="el.isSelected">&nbsp;&nbsp;{{ el.name }}
+                </div>
             </div>
-            <div class="col-md-3">
+            <div class="col-md-7">
                 <label>排名方式</label>
 
                 <div class="form-group">
@@ -158,7 +175,7 @@
             <tr ms-repeat="editProblemList">
                 <td>{{ el.sort_index }}</td>
                 <td>{{ el.title }}</td>
-                <td ms-visible="editMode=='2'">{{ el.score}}</td>
+                <td ms-visible="editMode=='2'">{{ el.score }}</td>
                 <td ms-text="el.visible?'可见':'不可见'"></td>
                 <td>{{ el.create_time|date("yyyy-MM-dd HH:mm:ss") }}</td>
                 <td>

From 3c10ccb8d237a2e359f5df19840ca71bc17ad842 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sat, 12 Sep 2015 17:08:29 +0800
Subject: [PATCH 34/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E6=AF=94=E8=B5=9B=E6=8E=92=E5=90=8D=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contest/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contest/models.py b/contest/models.py
index be80f9e..9b82c5c 100644
--- a/contest/models.py
+++ b/contest/models.py
@@ -12,8 +12,8 @@ class Contest(models.Model):
     description = models.TextField()
     # 比赛模式：0 即为是acm模式，1 即为是按照总的 ac 题目数量排名模式
     mode = models.IntegerField()
-    # 是否显示排名结果
-    show_rank = models.BooleanField()
+    # 是否显示实时排名结果
+    real_time_rank = models.BooleanField()
     # 是否显示别人的提交记录
     show_user_submission = models.BooleanField()
     # 只能超级管理员创建公开赛，管理员只能创建小组内部的比赛

From 2f6716356f88e7ab845579285d57b58596e82caa Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sat, 12 Sep 2015 19:14:36 +0800
Subject: [PATCH 35/38] =?UTF-8?q?migrate:contest.models=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=B9=E5=90=8D----show=5Frank=20=3D>=20real=5Ftime=5Frank?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contest/migrations/0008_auto_20150912_1912.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 contest/migrations/0008_auto_20150912_1912.py

diff --git a/contest/migrations/0008_auto_20150912_1912.py b/contest/migrations/0008_auto_20150912_1912.py
new file mode 100644
index 0000000..ee2a8f5
--- /dev/null
+++ b/contest/migrations/0008_auto_20150912_1912.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0007_contestsubmission_ac_time'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='contest',
+            old_name='show_rank',
+            new_name='real_time_rank',
+        ),
+    ]

From 120017b276f359741919b5224e2e8ebe0207d3da Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sat, 12 Sep 2015 19:58:41 +0800
Subject: [PATCH 36/38] =?UTF-8?q?[=E5=90=8E=E5=8F=B0-=E5=89=8D=E7=AB=AF]?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E6=AF=94=E8=B5=9B,?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=AF=94=E8=B5=9B=E9=A1=B5=E9=9D=A2,?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=81=E6=A6=9C=E5=8A=9F=E8=83=BD(?=
 =?UTF-8?q?=E5=9C=A8=E9=A1=B5=E9=9D=A2=E4=B8=AD=E8=A2=AB=E7=A7=B0=E4=BD=9C?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8E=92=E5=90=8D)=E8=8B=A5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=AF=94=E8=B5=9B=E9=9D=9E=E5=AE=9E=E6=97=B6=E6=8E=92?=
 =?UTF-8?q?=E5=90=8D=E9=82=A3=E4=B9=88=E5=89=8D=E7=AB=AFrank=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BC=93=E5=AD=98=E5=B0=86=E5=81=9C=E6=AD=A2=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0,=E4=BB=8E=E8=80=8C=E5=AE=9E=E7=8E=B0=E5=B0=81?=
 =?UTF-8?q?=E6=A6=9C=E5=8A=9F=E8=83=BD[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/contest/addContest.js | 15 ++--
 .../src/js/app/admin/contest/contestList.js   |  8 +--
 template/src/admin/contest/add_contest.html   | 25 +++----
 template/src/admin/contest/contest_list.html  | 69 +++++++++----------
 4 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js
index 44ac824..8aa5354 100644
--- a/static/src/js/app/admin/contest/addContest.js
+++ b/static/src/js/app/admin/contest/addContest.js
@@ -10,7 +10,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                     description: vm.description,
                     mode: vm.mode,
                     contest_type: 0,
-                    hide_rank: vm.hideRank,
+                    real_time_rank: vm.realTimeRank,
                     show_user_submission: vm.showSubmission,
                     start_time: vm.startTime,
                     end_time: vm.endTime,
@@ -57,9 +57,8 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                             vm.startTime = "";
                             vm.endTime = "";
                             vm.password = "";
-                            vm.mode = "";
-                            vm.hideRank = 0;
-                            vm.showSubmission = false;
+                            vm.mode = "0";
+                            vm.showSubmission = true;
                             location.hash = "#contest/contest_list";
                             vm.isGlobal = true;
                             vm.allGroups = [];
@@ -85,12 +84,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                 startTime: "",
                 endTime: "",
                 password: "",
-                mode: "",
-                hideRank: 0,
-                showSubmission: false,
+                mode: "0",
+                showSubmission: true,
                 isGlobal: true,
                 allGroups: [],
-                showGlobalViewRadio: true
+                showGlobalViewRadio: true,
+                realTimeRank: true
             });
 
         $.ajax({
diff --git a/static/src/js/app/admin/contest/contestList.js b/static/src/js/app/admin/contest/contestList.js
index 58f6196..315023c 100644
--- a/static/src/js/app/admin/contest/contestList.js
+++ b/static/src/js/app/admin/contest/contestList.js
@@ -11,7 +11,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                     description: vm.editDescription,
                     mode: vm.editMode,
                     contest_type: 0,
-                    hide_rank: vm.editHideRank,
+                    real_time_rank: vm.editRealTimeRank,
                     show_user_submission: vm.editShowSubmission,
                     start_time: vm.editStartTime,
                     end_time: vm.editEndTime,
@@ -84,10 +84,10 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
             vm.editStartTime = "";
             vm.editEndTime = "";
             vm.editMode = "";
-            vm.editHideRank = 0;
             vm.editShowSubmission = false;
             vm.editVisible = false;
             vm.editingProblemContestIndex = 0;
+            vm.editRealTimeRank = true;
         }
         else {
             var vm = avalon.define({
@@ -107,9 +107,9 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                 editStartTime: "",
                 editEndTime: "",
                 editMode: "",
-                editHideRank: false,
                 editShowSubmission: false,
                 editVisible: false,
+                editRealTimeRank: true,
                 editingProblemContestIndex: 0,
                 isGlobal: true,
                 allGroups: [],
@@ -149,6 +149,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                         vm.editEndTime = vm.contestList[contestId - 1].end_time.substring(0, 16).replace("T", " ");
                         vm.editMode = vm.contestList[contestId - 1].mode;
                         vm.editVisible = vm.contestList[contestId - 1].visible;
+                        vm.editRealTimeRank = vm.contestList[contestId - 1].real_time_rank;
                         if (vm.contestList[contestId - 1].contest_type == 0) { //contest type == 0, contest in group
                             vm.isGlobal = false;
                             for (var i = 0; i < vm.allGroups.length; i++) {
@@ -168,7 +169,6 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                         else {
                             vm.isGlobal = true;
                         }
-                        vm.editHideRank = vm.contestList[contestId - 1].Hide_rank;
                         vm.editShowSubmission = vm.contestList[contestId - 1].show_user_submission;
                         editor("#editor").setValue(vm.contestList[contestId - 1].description);
                         vm.editingProblemContestIndex = 0;
diff --git a/template/src/admin/contest/add_contest.html b/template/src/admin/contest/add_contest.html
index fd4ed11..54d16d8 100644
--- a/template/src/admin/contest/add_contest.html
+++ b/template/src/admin/contest/add_contest.html
@@ -21,7 +21,7 @@
                     <p class="error-info" ms-visible="description==''">请填写比赛描述</p>
                 </div>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-6">
                 <label>开始时间</label>
                 <div class="form-group">
                     <input type="text" class="form-control" name="start_time" id="contest_start_time"
@@ -29,7 +29,7 @@
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-6">
                 <label>结束时间</label>
                 <div class="form-group">
                     <input type="text" class="form-control" name="end_time" id="contest_end_time"
@@ -37,13 +37,6 @@
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
-            <div class="col-md-3">
-                <label>封榜时间(结束前/min)</label>
-                <div class="form-group">
-                    <input class="form-control" type="text" ms-duplex="hideRank" data-error="请填写封榜时间" required>
-                    <div class="help-block with-errors"></div>
-                </div>
-            </div>
             <div class="col-md-6">
                 <div class="form-group">
                     <label>可见范围</label>
@@ -88,11 +81,19 @@
                     </label>
                 </div>
             </div>
-            <div class="col-md-6">
-                <label>是否公开提交记录</label>
+            <div class="col-md-3">
+                <label>公开提交记录</label>
                 <div class="form-group">
                     <label class="text"><input type="checkbox" ms-duplex-checked="showSubmission">
-                        <small>允许查看提交记录</small>
+                        <small>公开</small>
+                    </label>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <label>实时排名</label>
+                <div class="form-group">
+                    <label class="text"><input type="checkbox" ms-duplex-checked="realTimeRank">
+                        <small>是</small>
                     </label>
                 </div>
             </div>
diff --git a/template/src/admin/contest/contest_list.html b/template/src/admin/contest/contest_list.html
index 40fd104..bde5ae4 100644
--- a/template/src/admin/contest/contest_list.html
+++ b/template/src/admin/contest/contest_list.html
@@ -24,7 +24,7 @@
         <tr ms-repeat="contestList">
             <td>{{ el.id }}</td>
             <td>{{ el.title }}</td>
-            <td ms-text="el.show_rank?'公开':'不公开'"></td>
+            <td ms-text="el.real_time_rank?'实时':'已封榜'"></td>
             <td>{{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
             <td>{{ el.created_by.username }}</td>
             <td ms-text="el.visible?'可见':'不可见'"></td>
@@ -66,7 +66,7 @@
                     <p class="error-info" ms-visible="editDescription==''">请填写比赛描述</p>
                 </div>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-6">
                 <label>开始时间</label>
 
                 <div class="form-group">
@@ -76,7 +76,7 @@
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-6">
                 <label>结束时间</label>
 
                 <div class="form-group">
@@ -86,36 +86,22 @@
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
-            <div class="col-md-3">
-                <label>封榜时间(结束前/min)</label>
-
-                <div class="form-group">
-                    <input class="form-control" ms-duplex="editHideRank" type="number" data-error="请填写封榜时间" required>
-
-                    <div class="help-block with-errors"></div>
-                </div>
-            </div>
             <div class="col-md-6">
                 <div class="form-group">
                     <label>可见范围</label>
-
-                    <div>
-                <span ms-if="showGlobalViewRadio">
-                    <label>
-                        <small><input type="radio" value="true" name="isGlobal" ms-duplex-boolean="isGlobal">全局可见
-                        </small>
-                    </label>
-                </span>
-                <span>
-                    <label>
-                        <small><input type="radio" value="false" name="isGlobal" ms-duplex-boolean="isGlobal">小组内可见
-                        </small>
-                    </label>
-                </span>
-                    </div>
-
+                    <span ms-if="showGlobalViewRadio">
+                        <label>
+                            <small><input type="radio" value="true" name="isGlobal" ms-duplex-boolean="isGlobal">全局可见
+                            </small>
+                        </label>
+                    </span>
+                    <span>
+                        <label>
+                            <small><input type="radio" value="false" name="isGlobal" ms-duplex-boolean="isGlobal">小组内可见
+                            </small>
+                        </label>
+                    </span>
                 </div>
-
             </div>
             <div class="col-md-6" ms-visible="isGlobal">
                 <label>密码保护</label>
@@ -127,7 +113,7 @@
                     <input type="checkbox" value="group_id" ms-duplex-checked="el.isSelected">&nbsp;&nbsp;{{ el.name }}
                 </div>
             </div>
-            <div class="col-md-7">
+            <div class="col-md-3">
                 <label>排名方式</label>
 
                 <div class="form-group">
@@ -140,17 +126,26 @@
                 </div>
             </div>
             <div class="col-md-2">
-                <label>是否可见</label><br>
-                <label><input type="checkbox" ms-duplex-checked="editVisible">
-                    <small> 可见</small>
-                </label>
+                <div class="form-group">
+                    <label>是否可见</label>
+                    <label><input type="checkbox" ms-duplex-checked="editVisible">
+                        <small> 可见</small>
+                    </label>
+                </div>
             </div>
             <div class="col-md-3">
-                <label>是否公开提交记录</label>
-
+                <label>公开提交记录</label>
                 <div class="form-group">
                     <label class="text"><input type="checkbox" ms-duplex-checked="editShowSubmission">
-                        <small>允许查看提交记录</small>
+                        <small>公开</small>
+                    </label>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <label>实时排名</label>
+                <div class="form-group">
+                    <label class="text"><input type="checkbox" ms-duplex-checked="editRealTimeRank">
+                        <small>是</small>
                     </label>
                 </div>
             </div>

From 196c3ee934171925de47f1ed7aaa02656d2c945c Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sat, 12 Sep 2015 20:00:56 +0800
Subject: [PATCH 37/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=94=A8redis=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oj/local_settings.py  | 6 ++++++
 oj/server_settings.py | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/oj/local_settings.py b/oj/local_settings.py
index 081b295..51e9095 100644
--- a/oj/local_settings.py
+++ b/oj/local_settings.py
@@ -25,6 +25,12 @@ DATABASES = {
     }
 }
 
+REDIS_CACHE = {
+    "host": "121.42.32.129",
+    "port": 6379,
+    "db": 1
+}
+
 DEBUG = True
 
 # 同理 这是 web 服务器的上传路径
diff --git a/oj/server_settings.py b/oj/server_settings.py
index a00d7bb..cc5ee82 100644
--- a/oj/server_settings.py
+++ b/oj/server_settings.py
@@ -29,6 +29,12 @@ DATABASES = {
     }
 }
 
+REDIS_CACHE = {
+    "host": "127.0.0.1",
+    "port": 6379,
+    "db": 1
+}
+
 DEBUG = True
 
 # 同理 这是 web 服务器的上传路径

From a084614af9d25e30ae4e7a18d34eee20bda72686 Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Sat, 12 Sep 2015 21:25:36 +0800
Subject: [PATCH 38/38] =?UTF-8?q?with=20open()=20=20as=20=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5=E6=B7=BB=E5=8A=A0try&except=EF=BC=8C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=B8=8A=E4=BC=A0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 problem/views.py |  9 ++++++---
 utils/views.py   | 14 ++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/problem/views.py b/problem/views.py
index 5128313..94e3a7a 100644
--- a/problem/views.py
+++ b/problem/views.py
@@ -147,9 +147,12 @@ class TestCaseUploadAPIView(APIView):
         f = request.FILES["file"]
 
         tmp_zip = "/tmp/" + rand_str() + ".zip"
-        with open(tmp_zip, "wb") as test_case_zip:
-            for chunk in f:
-                test_case_zip.write(chunk)
+        try:
+            with open(tmp_zip, "wb") as test_case_zip:
+                for chunk in f:
+                    test_case_zip.write(chunk)
+        except IOError:
+            return error_response(u"上传错误，写入临时目录失败")
 
         test_case_file = zipfile.ZipFile(tmp_zip, 'r')
         name_list = test_case_file.namelist()
diff --git a/utils/views.py b/utils/views.py
index af3afc9..87beeb4 100644
--- a/utils/views.py
+++ b/utils/views.py
@@ -18,10 +18,16 @@ class SimditorImageUploadAPIView(APIView):
 
         image_name = rand_str() + '.' + str(request.FILES["image"].name.split('.')[-1])
         image_dir = settings.IMAGE_UPLOAD_DIR + image_name
-        with open(image_dir, "wb") as imageFile:
-            for chunk in img:
-                imageFile.write(chunk)
+        try:
+            with open(image_dir, "wb") as imageFile:
+                for chunk in img:
+                    imageFile.write(chunk)
+        except IOError:
+            return Response(data={
+                "success": True,
+                "msg": "上传错误",
+                "file_path": "/static/upload_image/" + image_name})
         return Response(data={
             "success": True,
-            "msg": "error message",
+            "msg": "",
             "file_path": "/static/upload_image/" + image_name})