From 299d2a48e0994b5fba0c0e1489315194b301afd3 Mon Sep 17 00:00:00 2001
From: sxw <sxwxs@msn.com>
Date: Wed, 9 Dec 2015 21:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=81=E6=AD=A2=E4=BB=BB?=
 =?UTF-8?q?=E4=BD=95=E4=BA=BA=E5=8A=A0=E5=85=A5=E7=9A=84=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/oj/group/group.html      |  4 ++--
 template/src/oj/group/group_list.html | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/template/src/oj/group/group.html b/template/src/oj/group/group.html
index 003dd80c..bbf6c32b 100644
--- a/template/src/oj/group/group.html
+++ b/template/src/oj/group/group.html
@@ -28,13 +28,13 @@
     {% if not joined %}
     <hr>
     <div>
-        {% if group.join_group_setting %}
+        {% ifequal group.join_group_setting 1 %}
         <div class="form-group">
             <input id="groupId" value="{{ group.id }" type="hidden">
             <label>申请信息</label>
             <textarea class="form-control" id="applyMessage" rows="10"></textarea>
         </div>
-        {% endif %}
+        {% endifequal %}
         
         <div class="form-group">
             <button class="btn btn-primary" id="sendApplication">{% if group.join_group_setting %}申请{% endif %}加入</button>
diff --git a/template/src/oj/group/group_list.html b/template/src/oj/group/group_list.html
index 03e425cb..575102bd 100644
--- a/template/src/oj/group/group_list.html
+++ b/template/src/oj/group/group_list.html
@@ -34,11 +34,15 @@
                                 <th scope="row"><a href="/group/{{ item.id }}/" target="_blank">{{ item.id }}</a></th>
                                 <td><a href="/group/{{ item.id }}/" target="_blank">{{ item.name }}</a></td>
                                 <td>
-                                    {% if item.join_group_setting %}
+                                    {% ifequal item.join_group_setting 1 %}
                                         需要申请
-                                    {% else %}
+                                    {% endifequal %}
+                                    {% ifequal item.join_group_setting 0 %}
                                         无需申请
-                                    {% endif %}
+                                    {% endifequal %}
+                                    {% ifequal item.join_group_setting 2 %}
+                                        不允许加入
+                                    {% endifequal %}
                                 </td>
                                 <td>{{ item.created_by }}</td>
                                 <td>{{ item.create_time }}</td>