Accept Merge Request #116 修改导航栏的 url;修复我的提交顺序顺序问题 : (virusdefender-dev -> dev)

Merge Request: 修改导航栏的 url;修复我的提交顺序顺序问题
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/116
This commit is contained in:
virusdefender 2015-08-22 21:04:17 +08:00
commit f250dec201
3 changed files with 54 additions and 62 deletions

View File

@ -117,7 +117,7 @@ class SubmissionAdminAPIView(APIView):
@login_required
def my_submission_list_page(request, page=1):
submissions = Submission.objects.filter(user_id=request.user.id). \
values("id", "result", "create_time", "accepted_answer_time", "language")
values("id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time")
paginator = Paginator(submissions, 20)
try:
current_page = paginator.page(int(page))
@ -135,4 +135,4 @@ def my_submission_list_page(request, page=1):
return render(request, "oj/submission/my_submissions_list.html",
{"submissions": current_page, "page": int(page),
"previous_page": previous_page, "next_page": next_page, "startId":int(page)*20-20})
"previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20})

View File

@ -4,14 +4,6 @@
{% load submission %}
<div class="container main">
<ul class="nav nav-tabs nav-tabs-google">
<li role="presentation">
<a href="/submission/">提交</a></li>
<li role="presentation" class="active">
<a href="/submission/my_submissions/">我的提交</a></li>
</ul>
<br>
{% if submissions %}
<table class="table table-bordered">
<thead>
@ -27,7 +19,7 @@
{% for item in submissions %}
<tr class="{{ item.result|translate_result_class }}">
<th scope="row"><a href="/my_submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
{{ forloop.counter |add:startId }}</a></th>
{{ forloop.counter |add:start_id }}</a></th>
<td>{{ item.create_time }}</td>
<td>{{ item.result|translate_result }}</td>
<td>

View File

@ -43,7 +43,7 @@
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="/problems/">题目</a></li>
<li><a href="/submissions/">提交</a></li>
<li><a href="/my_submissions/">提交</a></li>
<li><a href="/contests/">比赛</a></li>
<li><a href="/about/">关于</a></li>
</ul>