From 22f344e6158f1dd519167f89e52b75189a0992b8 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Wed, 26 Aug 2015 13:52:12 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E5=AE=8C=E6=88=90=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E5=88=97=E8=A1=A8=E4=B8=AD,=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=AF=94=E8=B5=9B=E6=8F=90=E4=BA=A4=E7=9A=84=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8Eapi=E7=9A=84=E5=AF=B9=E6=8E=A5[CI=20?=
 =?UTF-8?q?SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/contest/contestList.js    |  9 ++++++---
 static/src/js/app/admin/contest/submissionList.js | 10 +++++++---
 template/src/admin/contest/contest_list.html      |  8 +++++---
 template/src/admin/contest/submission_list.html   |  5 ++++-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/static/src/js/app/admin/contest/contestList.js b/static/src/js/app/admin/contest/contestList.js
index 5dc9bbb..036b344 100644
--- a/static/src/js/app/admin/contest/contestList.js
+++ b/static/src/js/app/admin/contest/contestList.js
@@ -237,11 +237,14 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
             addProblem: function () {
                 vm.$fire("up!showContestProblemPage", 0, vm.contestList[vm.editingProblemContestIndex-1].id, vm.editMode);
             },
-            showProblemEditor: function(el) {
+            showProblemEditPage: function(el) {
                 vm.$fire("up!showContestProblemPage", el.id, vm.contestList[vm.editingProblemContestIndex-1].id, vm.editMode);
             },
-            showSubmissionPage: function() {
-                vm.$fire("up!showContestSubmissionPage", 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);
             },
             getYesOrNo: function(yORn) {
                 if (yORn) return "是";
diff --git a/static/src/js/app/admin/contest/submissionList.js b/static/src/js/app/admin/contest/submissionList.js
index ff375b2..34fd591 100644
--- a/static/src/js/app/admin/contest/submissionList.js
+++ b/static/src/js/app/admin/contest/submissionList.js
@@ -44,13 +44,15 @@ require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfT
                     }
                 },
                 getPage: function (page_index) {
+                    if (!page_index)
+                        var page_index = vm.page;
                     getPageData(page_index);
                 },
                 showSubmissionDetailPage: function (submissionId) {
 
                 },
-                showProblemListPage: function(){
-                    vm.$fire("up!showProblemListPage");
+                goBack: function(check){
+                        vm.$fire("up!showContestListPage");
                 }
             });
         }
@@ -58,7 +60,9 @@ require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfT
         getPageData(1);
 
         function getPageData(page) {
-            var url = "/api/admin/submission/?paging=true&page=" + page + "&page_size=10&problem_id=" + avalon.vmodels.admin.problemId;
+            var url = "/api/admin/contest_submission/?paging=true&page=" + page + "&page_size=10&contest_id=" + avalon.vmodels.admin.$contestId;
+            if (avalon.vmodels.admin.$problemId)
+                url += "&problem_id=" + avalon.vmodels.admin.$problemId
             $.ajax({
                 url: url,
                 dataType: "json",
diff --git a/template/src/admin/contest/contest_list.html b/template/src/admin/contest/contest_list.html
index b5e4d6a..1b09534 100644
--- a/template/src/admin/contest/contest_list.html
+++ b/template/src/admin/contest/contest_list.html
@@ -158,8 +158,8 @@
     </div>
     <div class="col-md-12" ms-visible="editingProblemContestIndex">
         <label>题目列表</label>
-        <a href="javascript:void(0)" class="btn btn-success btn-sm" ms-click="addProblem()">添加</a>
-        <a href="javascript:void(0)" class="btn btn-success btn-sm" ms-click="showSubmission()">查看提交</a>
+        <a href="javascript:void(0)" class="btn btn-success btn-sm" ms-click="addProblem()">添加题目</a>
+        <a href="javascript:void(0)" class="btn btn-info btn-sm" ms-click="showSubmissionPage()">查看提交</a>
         <table class="table table-striped">
             <tr>
                 <th>编号</th>
@@ -177,7 +177,9 @@
                 <td>{{ el.create_time|date("yyyy-MM-dd HH:mm:ss") }}</td>
                 <td>
                     <a href="javascript:void(0)" class="btn-sm btn-info"
-                       ms-click="showProblemEditor(el)">编辑</a>
+                       ms-click="showProblemEditPage(el)">编辑</a>
+                    <a href="javascript:void(0)" class="btn-sm btn-info"
+                       ms-click="showSubmissionPage(el)">提交</a>
                 </td>
             </tr>
         </table>
diff --git a/template/src/admin/contest/submission_list.html b/template/src/admin/contest/submission_list.html
index 008f4eb..1847408 100644
--- a/template/src/admin/contest/submission_list.html
+++ b/template/src/admin/contest/submission_list.html
@@ -1,11 +1,14 @@
 <div ms-controller="contestSubmissionList" class="col-md-9">
     <nav>
         <ul class="pager">
-            <li class="previous" ms-click="showProblemListPage()"><a href="javascript:void(0)"><span
+            <li class="previous" ms-click="goBack()"><a href="javascript:void(0)"><span
                     aria-hidden="true">&larr;</span> 返回</a></li>
         </ul>
     </nav>
     <h1>提交列表</h1>
+        <a href="javascript:void(0)" class="btn btn-sm btn-primary" ms-click="getPage(1)">
+            <span class="glyphicon glyphicon-refresh"></span> 刷新
+        </a>
 
     <table class="table table-striped">
         <tr>