From bbf3b42edc24d1b5f37f528bd222bd4230873021 Mon Sep 17 00:00:00 2001
From: sxw <sxwxs@msn.com>
Date: Sat, 5 Dec 2015 15:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=90=8E=E5=8F=B0=E6=AF=94=E8=B5=9B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E6=9C=89=E5=AF=86=E7=A0=81=E7=9A=84=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E8=B5=9B=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/contest/addContest.js |  4 ++++
 .../src/js/app/admin/contest/editContest.js   |  6 +++++-
 template/src/admin/contest/add_contest.html   | 20 +++++++++++++------
 template/src/admin/contest/edit_contest.html  | 20 +++++++++++++------
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js
index e84f6b0..0fd6f9f 100644
--- a/static/src/js/app/admin/contest/addContest.js
+++ b/static/src/js/app/admin/contest/addContest.js
@@ -22,6 +22,10 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                             selectedGroups.push(vm.allGroups[i].id);
                         }
                     }
+                    if (vm.password) {
+                        ajaxData.password = vm.password;
+                        ajaxData.contest_type = 3;
+                    }
                     ajaxData.groups = selectedGroups;
                 }
                 else {
diff --git a/static/src/js/app/admin/contest/editContest.js b/static/src/js/app/admin/contest/editContest.js
index 67a027c..a497817 100644
--- a/static/src/js/app/admin/contest/editContest.js
+++ b/static/src/js/app/admin/contest/editContest.js
@@ -23,6 +23,10 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                             selectedGroups.push(vm.allGroups[i].id);
                         }
                     }
+                    if (vm.password) {
+                        ajaxData.password = vm.password;
+                        ajaxData.contest_type = 3;
+                    }
                     ajaxData.groups = selectedGroups;
                 }
                 else {
@@ -131,7 +135,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                                         vm.startTime = contest.start_time.substring(0, 16).replace("T", " ");
                                         vm.endTime = contest.end_time.substring(0, 16).replace("T", " ");
                                         vm.password = contest.password;
-                                        if (contest.contest_type == 0) { //contest_type == 0, 小组内比赛
+                                        if (contest.contest_type == 0 || contest.contest_type == 3) { //contest_type == 0, 小组内比赛
                                             vm.isGlobal = false;
                                             for (var i = 0; i < vm.allGroups.length; i++) {
                                                 vm.allGroups[i].isSelected = false;
diff --git a/template/src/admin/contest/add_contest.html b/template/src/admin/contest/add_contest.html
index 010b73e..e973316 100644
--- a/template/src/admin/contest/add_contest.html
+++ b/template/src/admin/contest/add_contest.html
@@ -46,13 +46,13 @@
                     <div>
                 <span ms-if="showGlobalViewRadio">
                     <label>
-                        <small><input type="radio" value="true" name="isGlobal" ms-duplex-boolean="isGlobal">全局可见
+                        <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><input type="radio" value="false" name="isGlobal" ms-duplex-boolean="isGlobal">小组赛
                         </small>
                     </label>
                 </span>
@@ -60,10 +60,18 @@
 
                 </div>
             </div>
-            <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 class="col-md-6" >
+                <div ms-visible="isGlobal">
+                    <label>密码保护</label>
+                    <div class="form-group">
+                        <input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="password">
+                    </div>
+                </div>
+                <div ms-visible="!isGlobal">
+                    <label>邀请密码</label>
+                    <div class="form-group">
+                        <input type="text" class="form-control" name="password" placeholder="留空则只有小组内可以参加" ms-duplex="password">
+                    </div>
                 </div>
             </div>
             <div class="form-group col-md-12" ms-visible="!isGlobal">
diff --git a/template/src/admin/contest/edit_contest.html b/template/src/admin/contest/edit_contest.html
index 08f7c09..3e50603 100644
--- a/template/src/admin/contest/edit_contest.html
+++ b/template/src/admin/contest/edit_contest.html
@@ -55,13 +55,13 @@
                 <div>
                 <span ms-if="showGlobalViewRadio">
                     <label>
-                        <small><input type="radio" value="true" name="isGlobal" ms-duplex-boolean="isGlobal">全局可见
+                        <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><input type="radio" value="false" name="isGlobal" ms-duplex-boolean="isGlobal">小组赛
                         </small>
                     </label>
                 </span>
@@ -69,11 +69,19 @@
 
             </div>
         </div>
-        <div class="col-md-6" ms-visible="isGlobal">
-            <label>密码保护</label>
+        <div class="col-md-6">
+            <div ms-visible="isGlobal">
+                <label>密码保护</label>
 
-            <div class="form-group">
-                <input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="password">
+                <div class="form-group">
+                    <input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="password">
+                </div>
+            </div>
+            <div ms-visible="!isGlobal">
+                <label>邀请密码</label>
+                <div class="form-group">
+                    <input type="text" class="form-control" name="password" placeholder="留空则只有小组内可以参加" ms-duplex="password">
+                </div>
             </div>
         </div>
         <div class="form-group col-md-12" ms-visible="!isGlobal">