mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2025-11-04 14:49:58 +08:00
Accept Merge Request #45 : (sxw-dev -> dev)
Merge Request: 更新后台announcement的功能 Created By: @esp Accepted By: @esp URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/45
This commit is contained in:
commit
139a1b74f5
39
account/migrations/0001_initial.py
Normal file
39
account/migrations/0001_initial.py
Normal file
@ -0,0 +1,39 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
import account.models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='User',
|
||||
fields=[
|
||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||
('password', models.CharField(max_length=128, verbose_name='password')),
|
||||
('last_login', models.DateTimeField(null=True, verbose_name='last login', blank=True)),
|
||||
('username', models.CharField(unique=True, max_length=30)),
|
||||
('real_name', models.CharField(max_length=30, null=True, blank=True)),
|
||||
('email', models.EmailField(max_length=254, null=True, blank=True)),
|
||||
('create_time', models.DateTimeField(auto_now_add=True)),
|
||||
('admin_type', models.IntegerField(default=0)),
|
||||
],
|
||||
options={
|
||||
'db_table': 'user',
|
||||
},
|
||||
managers=[
|
||||
('objects', account.models.UserManager()),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AdminGroup',
|
||||
fields=[
|
||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||
],
|
||||
),
|
||||
]
|
||||
0
account/migrations/__init__.py
Normal file
0
account/migrations/__init__.py
Normal file
@ -11,4 +11,4 @@ class AdminTemplateView(APIView):
|
||||
try:
|
||||
return HttpResponse(open(path).read(), content_type="text/html")
|
||||
except IOError:
|
||||
return HttpResponse(u"模板不存在", content_type="text/html")
|
||||
raise Http404
|
||||
|
||||
@ -24,4 +24,8 @@ img {
|
||||
|
||||
label {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
[ms-controller] {
|
||||
display: none
|
||||
}
|
||||
@ -1,17 +1,23 @@
|
||||
require(["jquery", "avalon", "csrf", "bs_alert", "editor", "validation"], function ($, avalon, csrfHeader, bs_alert, editor) {
|
||||
announcementEditor = editor("#editor"); //创建新建公告的内容编辑器
|
||||
editAnnouncementEditor = null;
|
||||
editAnnouncementEditor = editor("#editAnnouncementEditor");
|
||||
|
||||
if (!avalon.vmodels.announcement) // 防止模式重新定义
|
||||
{
|
||||
// avalon:定义模式 announcement
|
||||
vm = avalon.define({
|
||||
avalon.vmodels.announcement = null;
|
||||
|
||||
// avalon:定义模式 announcement
|
||||
avalon.ready(function () {
|
||||
var vm = avalon.define({
|
||||
$id: "announcement",
|
||||
announcement: [], // 公告列表数据项
|
||||
previous_page: 0, // 之前的页数
|
||||
next_page: 0, // 之后的页数
|
||||
page: 1, // 当前页数
|
||||
isEditing: 0, // 正在编辑的公告的ID, 为零说明未在编辑
|
||||
//通用变量
|
||||
announcement: [], // 公告列表数据项
|
||||
previous_page: 0, // 之前的页数
|
||||
next_page: 0, // 之后的页数
|
||||
page: 1, // 当前页数
|
||||
isEditing: 0, // 正在编辑的公告的ID, 为零说明未在编辑
|
||||
page_count: 1, // 总页数
|
||||
visableOnly: false, //仅显示可见公告
|
||||
// 编辑
|
||||
announcementVisible: 0,
|
||||
getState: function (el) { //获取公告当前状态,显示
|
||||
if (el.visible)
|
||||
return "可见";
|
||||
@ -21,14 +27,14 @@ require(["jquery", "avalon", "csrf", "bs_alert", "editor", "validation"], functi
|
||||
getNext: function (el) {
|
||||
if (!vm.next_page)
|
||||
return;
|
||||
getPageData(++(vm.page));
|
||||
getPageData(vm.page + 1);
|
||||
},
|
||||
getPrevious: function (el) {
|
||||
if (!vm.previous_page)
|
||||
return;
|
||||
getPageData(--(vm.page));
|
||||
getPageData(vm.page - 1);
|
||||
},
|
||||
getBtnClass: function (btn) {
|
||||
getBtnClass: function (btn) { //上一页/下一页按钮启用禁用逻辑
|
||||
if (btn) {
|
||||
return vm.next_page ? "btn btn-primary" : "btn btn-primary disabled";
|
||||
}
|
||||
@ -37,13 +43,10 @@ require(["jquery", "avalon", "csrf", "bs_alert", "editor", "validation"], functi
|
||||
}
|
||||
|
||||
},
|
||||
enEdit: function (el) { //点击编辑按钮的事件,显示/隐藏编辑区
|
||||
enEdit: function (el) { //点击编辑按钮的事件,显示/隐藏编辑区
|
||||
$("#newTitle").val(el.title);
|
||||
if (!editAnnouncementEditor) //初始化编辑器
|
||||
editAnnouncementEditor = editor("#editAnnouncementEditor");
|
||||
editAnnouncementEditor.setValue(el.content);
|
||||
if (el.visible == false)
|
||||
$("#hidden").attr("checked", true);
|
||||
vm.announcementVisible = el.visible;
|
||||
if (vm.isEditing == el.id)
|
||||
vm.isEditing = 0;
|
||||
else
|
||||
@ -54,21 +57,25 @@ require(["jquery", "avalon", "csrf", "bs_alert", "editor", "validation"], functi
|
||||
vm.isEditing = 0;
|
||||
},
|
||||
submitChange: function () { // 处理编辑公告提交事件,顺便验证字段为空
|
||||
var title = $("#newTitle").val(), content = editAnnouncementEditor.getValue(), visible = true;
|
||||
if ($("#hidden").attr("checked") == true)
|
||||
visible = false;
|
||||
var title = $("#newTitle").val(), content = editAnnouncementEditor.getValue();
|
||||
if (title != "") {
|
||||
if (content != "") {
|
||||
$.ajax({ //发送修改公告请求
|
||||
beforeSend: csrfHeader,
|
||||
url: "/api/edit_announcements/",
|
||||
url: "/api/admin/announcement/",
|
||||
dataType: "json",
|
||||
method: "post",
|
||||
data: {id: vm.isEditing, title: title, content: content, visible: visible},
|
||||
method: "put",
|
||||
data: {
|
||||
id: vm.isEditing,
|
||||
title: title,
|
||||
content: content,
|
||||
visible: vm.announcementVisible
|
||||
},
|
||||
success: function (data) {
|
||||
if (!data.code) {
|
||||
bs_alert("修改成功");
|
||||
vm.isEditing = 0;
|
||||
getPageData(1);
|
||||
}
|
||||
else {
|
||||
bs_alert(data.data);
|
||||
@ -83,72 +90,81 @@ require(["jquery", "avalon", "csrf", "bs_alert", "editor", "validation"], functi
|
||||
bs_alert("公告标题不能为空");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
avalon.scan();
|
||||
getPageData(1); //公告列表初始化
|
||||
vm.page = 1;
|
||||
vm.isEditing = 0;
|
||||
//Ajax get数据
|
||||
function getPageData(page) {
|
||||
$.ajax({
|
||||
beforeSend: csrfHeader,
|
||||
url: "/api/announcements/?paging=true&page=" + page + "&page_size=10",
|
||||
dataType: "json",
|
||||
method: "get",
|
||||
success: function (data) {
|
||||
if (!data.code) {
|
||||
vm.announcement = data.data.results;
|
||||
vm.previous_page = data.data.previous_page;
|
||||
vm.next_page = data.data.next_page;
|
||||
}
|
||||
else {
|
||||
bs_alert(data.data);
|
||||
}
|
||||
}
|
||||
vm.$watch("visableOnly", function () {
|
||||
getPageData(1);
|
||||
});
|
||||
}
|
||||
|
||||
//新建公告表单验证与数据提交
|
||||
$("#announcement-form")
|
||||
.formValidation({
|
||||
framework: "bootstrap",
|
||||
fields: {
|
||||
title: {
|
||||
validators: {
|
||||
notEmpty: {
|
||||
message: "请填写公告标题"
|
||||
avalon.scan();
|
||||
|
||||
getPageData(1); //公告列表初始化
|
||||
|
||||
//Ajax get数据
|
||||
function getPageData(page) {
|
||||
var visible = '';
|
||||
if (vm.visableOnly == true)
|
||||
visible = "&visible=true";
|
||||
$.ajax({
|
||||
beforeSend: csrfHeader,
|
||||
url: "/api/announcements/?paging=true&page=" + page + "&page_size=10" + visible,
|
||||
dataType: "json",
|
||||
method: "get",
|
||||
success: function (data) {
|
||||
if (!data.code) {
|
||||
vm.announcement = data.data.results;
|
||||
vm.page_count = data.data.total_page;
|
||||
vm.previous_page = data.data.previous_page;
|
||||
vm.next_page = data.data.next_page;
|
||||
vm.page = page;
|
||||
}
|
||||
else {
|
||||
bs_alert(data.data);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//新建公告表单验证与数据提交
|
||||
$("#announcement-form")
|
||||
.formValidation({
|
||||
framework: "bootstrap",
|
||||
fields: {
|
||||
title: {
|
||||
validators: {
|
||||
notEmpty: {
|
||||
message: "请填写公告标题"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
).on('success.form.fv', function (e) {
|
||||
e.preventDefault();
|
||||
var title = $("#title").val();
|
||||
var content = announcementEditor.getValue();
|
||||
if (content == "") {
|
||||
bs_alert("请填写公告内容");
|
||||
return;
|
||||
}
|
||||
$.ajax({
|
||||
beforeSend: csrfHeader,
|
||||
url: "/api/admin/announcement/",
|
||||
data: {title: title, content: content},
|
||||
dataType: "json",
|
||||
method: "post",
|
||||
success: function (data) {
|
||||
if (!data.code) {
|
||||
bs_alert("提交成功!");
|
||||
$("#title").val("");
|
||||
announcementEditor.setValue("");
|
||||
getPageData(1, function (data) {
|
||||
});
|
||||
} else {
|
||||
bs_alert(data.data);
|
||||
}
|
||||
).on('success.form.fv', function (e) {
|
||||
e.preventDefault();
|
||||
var title = $("#title").val();
|
||||
var content = announcementEditor.getValue();
|
||||
if (content == "") {
|
||||
bs_alert("请填写公告内容");
|
||||
return;
|
||||
}
|
||||
})
|
||||
});
|
||||
$.ajax({
|
||||
beforeSend: csrfHeader,
|
||||
url: "/api/admin/announcement/",
|
||||
data: {title: title, content: content},
|
||||
dataType: "json",
|
||||
method: "post",
|
||||
success: function (data) {
|
||||
if (!data.code) {
|
||||
bs_alert("提交成功!");
|
||||
$("#title").val("");
|
||||
announcementEditor.setValue("");
|
||||
getPageData(1, function (data) {
|
||||
});
|
||||
} else {
|
||||
bs_alert(data.data);
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
@ -103,7 +103,7 @@
|
||||
<img src="/static/img/loading.gif" id="loading-gif">
|
||||
<!-- custom body begin -->
|
||||
|
||||
<div class='col-md-8' ms-include-src="template_url" data-include-rendered="hide_loading"></div>
|
||||
<div ms-include-src="template_url" data-include-rendered="hide_loading"></div>
|
||||
|
||||
<!-- custom body end -->
|
||||
</div>
|
||||
|
||||
67
template/admin/announcement/announcement.html
Normal file
67
template/admin/announcement/announcement.html
Normal file
@ -0,0 +1,67 @@
|
||||
<style></style>
|
||||
|
||||
<div ms-controller="announcement" class="col-md-9">
|
||||
<h1>Announcement</h1>
|
||||
<table class="table table-striped">
|
||||
<tr>
|
||||
<th>编号</th>
|
||||
<th>标题</th>
|
||||
<th>创建时间</th>
|
||||
<th>更新时间</th>
|
||||
<th>创建者</th>
|
||||
<th>状态</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
<tr ms-repeat="announcement">
|
||||
<td>{{el.id}}</td>
|
||||
<td>{{el.title}}</td>
|
||||
<td>{{el.create_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
|
||||
<td>{{el.last_update_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
|
||||
<td>{{el.created_by.username}}</td>
|
||||
<td>{{getState(el)}}</td>
|
||||
<td>
|
||||
<button class="btn-sm btn-info" ms-click="enEdit(el)">编辑</button>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div class="form-group">
|
||||
<label>仅显示可见 <input ms-duplex-checked="visableOnly" type="checkbox"/></label>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
页数:{{page}}/{{page_count}}
|
||||
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
|
||||
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
|
||||
</div>
|
||||
|
||||
<div ms-visible="isEditing">
|
||||
<h3>编辑公告</h3>
|
||||
<div class="form-group"><label for="title">标题</label>
|
||||
<input name="title" type="text" class="form-control" id="newTitle" placeholder="公告标题" value=""></div>
|
||||
<div class="form-group">
|
||||
<label>内容</label>
|
||||
<textarea id="editAnnouncementEditor"></textarea>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>可见 <input ms-duplex-checked="announcementVisible" type="checkbox"/></label>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button ms-click="submitChange()" class="btn btn-primary">提交</button>
|
||||
|
||||
<button ms-click="disEdit()" class="btn btn-danger">取消</button>
|
||||
</div>
|
||||
</div>
|
||||
<h3>添加公告</h3>
|
||||
|
||||
<form id="announcement-form">
|
||||
<div class="form-group"><label for="title">标题</label>
|
||||
<input name="title" type="text" class="form-control" id="title" placeholder="公告标题"></div>
|
||||
<div class="form-group">
|
||||
<label>内容</label>
|
||||
<textarea id="editor" placeholder="公告内容"></textarea>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button type="submit" class="btn btn-primary">提交</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<script src="/static/js/app/admin/announcement/announcement.js"></script>
|
||||
@ -1,6 +1,4 @@
|
||||
<div ms-controller="add_contest">
|
||||
|
||||
|
||||
<form id="add-contest-form">
|
||||
<div class="col-md-9">
|
||||
<div class="col-md-12">
|
||||
|
||||
@ -70,7 +70,11 @@ def paginate(request, query_set, object_serializer):
|
||||
except Exception:
|
||||
return error_response(u"参数错误")
|
||||
|
||||
data = {"results": object_serializer(current_page, many=True).data, "previous_page": None, "next_page": None}
|
||||
data = {"results": object_serializer(current_page, many=True).data,
|
||||
"previous_page": None,
|
||||
"next_page": None,
|
||||
"count": paginator.count,
|
||||
"total_page": paginator.num_pages}
|
||||
|
||||
try:
|
||||
data["previous_page"] = current_page.previous_page_number()
|
||||
@ -82,4 +86,4 @@ def paginate(request, query_set, object_serializer):
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return success_response(data)
|
||||
return success_response(data)
|
||||
|
||||
@ -51,14 +51,18 @@ class PaginatorTest(APITestCase):
|
||||
self.assertEqual(response.data, {"code": 1, "data": u"参数错误"})
|
||||
|
||||
def test_correct_paginate(self):
|
||||
response = self.client.get(self.url + "?paging=true&limit=1&page_size=1&page=1")
|
||||
response = self.client.get(self.url + "?paging=true&page_size=1&page=1")
|
||||
self.assertEqual(response.data["code"], 0)
|
||||
self.assertEqual(response.data["data"]["previous_page"], None)
|
||||
self.assertEqual(response.data["data"]["next_page"], 2)
|
||||
self.assertEqual(len(response.data["data"]["results"]), 1)
|
||||
self.assertEqual(response.data["data"]["count"], 2)
|
||||
self.assertEqual(response.data["data"]["total_page"], 2)
|
||||
|
||||
response = self.client.get(self.url + "?paging=true&limit=1&page_size=2&page=1")
|
||||
response = self.client.get(self.url + "?paging=true&page_size=2&page=1")
|
||||
self.assertEqual(response.data["code"], 0)
|
||||
self.assertEqual(response.data["data"]["previous_page"], None)
|
||||
self.assertEqual(response.data["data"]["next_page"], None)
|
||||
self.assertEqual(len(response.data["data"]["results"]), 2)
|
||||
self.assertEqual(response.data["data"]["count"], 2)
|
||||
self.assertEqual(response.data["data"]["total_page"], 1)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user