Merge branch 'dev-s' into virusdefender-dev

* dev-s: 小调整，修改addContest的小bug，修复小bug，仿照problem GET添加获取单个比赛信息的API 添加后台编辑比赛页面[CI SKIP] Conflicts: static/src/js/app/admin/contest/contestList.js static/src/js/app/admin/contest/editContest.js
2015-10-30 15:16:24 +08:00
parent 38202b6bf2 edaad01253
commit c295d5d032
3 changed files with 43 additions and 48 deletions
--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@@ -59,7 +59,7 @@
                            {{ request.user.username }}
                            <span class="caret"></span></a>
                        <ul class="dropdown-menu">
-                            {% if request.user.admin_type == 2 %}
+                            {% if request.user.admin_type > 0 %}
                                <li><a href="/admin/">后台管理</a></li>
                            {% endif %}
                            <li><a href="/submissions/">我的提交</a></li>