xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-sxw' into virusdefender-dev

Browse Source 
* dev-sxw:
  添加到编辑比赛页的入口[CI SKIP]
  修复重复进入页面导致小组列表不断增加的问题，每次先清空[CI SKIP]
  修改一些小问题，主要是在非管理员用户时，会调用models的字典对象的get方法，实际上这个字典没有get方法，会引发500，修改成了判断比赛（或者比赛题目）的创建者是否等于request.user；   另外仿照problem添加了对单个比赛信息的GETapi
  添加admin编辑比赛页面以及js[CI SKIP]
  修改提交样式
  调整顺序
  更新
  Revert "修改比赛单个题目列表的样式"
  修改比赛单个题目列表的样式
  update contest_problem.html
  update contest_problem.html
  添加运行判体脚本[CI SKIP]
  对盘题系统针对新测试服务器进行调整,该分支将不会并入主分支[CI SKIP]
  correct the path of test case in judger
  原来的dockerimage里没有MySQL-python,所以又改了下[CI SKIP]
  漏了一个import[CI SKIP]
  这是为了能以root身份运行celery[CI SKIP]
  为了在qduoj.cf上运行做了改动，因为判题和web都在一台机器上，这个docker image是从digitalOcean上download下来的[CI SKIP]
This commit is contained in:
virusdefender
2015-10-29 17:46:05 +08:00
parent 7eb47571a5 118fd45e3e
commit bad544544a
9 changed files with 314 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
template/src/admin/contest/edit_contest.html Normal file
View File

@@ -0,0 +1,107 @@
<div ms-controller="edit_contest" class="col-md-9">
<form id="edit-contest-form">
<nav>
<ul class="pager">
<li class="previous" ms-click="showContestListPage()"><a href="javascript:void(0)"><span
aria-hidden="true">&larr;</span> 返回</a></li>
</ul>
</nav>
<div class="col-md-12">
<label>比赛名称</label>
</div>
<div class="col-md-12">
<div class="form-group">
<input type="text" name="name" class="form-control" ms-duplex="title"
data-error="请填写比赛名称(名称不能超过50个字)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-12">
<label>说明</label>
</div>
<div class="col-md-12">
<div class="form-group">
<ms:editor $id="contestDescriptionEditor" config="contestDescriptionEditor"></ms:editor>
</div>
</div>
<div class="col-md-6">
<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">
<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-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>
</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>
</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-6">
<label>实时排名</label>
<div class="form-group">
<label class="text"><input type="checkbox" ms-duplex-checked="realTimeRank">
<small>不勾选则排名不更新，且只显示自己的提交。</small>
</label>
</div>
</div>
<div class="col-md-6">
<label>是否可见</label>
<div class="form-group">
<label class="text"><input type="checkbox" ms-duplex-checked="visible">
<small>可见</small>
</label>
</div>
</div>
<div class="col-md-12">
<input type="submit" class="btn btn-success btn-lg" value="发布比赛">
</div>
</form>
</div>
<script src="/static/js/app/admin/contest/editContest.js"></script>