Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some functions、Fix some bugs #253

Open
wants to merge 176 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
176 commits
Select commit Hold shift + click to select a range
69d487c
add only admin in user page
BBBob Mar 19, 2019
b373dae
delete blank line contains whitespace
BBBob Mar 19, 2019
1d52d6e
fix over-indented in test file
BBBob Mar 19, 2019
db3b3fa
Remove bad quotes
BBBob Mar 19, 2019
0d354d8
add username directory and contest name for submission download
BBBob Mar 25, 2019
efc4f3f
download the latest submission for OI mode
BBBob Mar 26, 2019
3242c56
support Chinese contest name for submission download
BBBob Mar 27, 2019
aa5673b
Merge branch 'download_submission' of https://github.com/BBBob/Online…
Harry-zklcdc Apr 4, 2019
4bd37f9
Merge branch 'BBBob-download_submission'
Harry-zklcdc Apr 4, 2019
ccaebba
完善代码下载功能
Harry-zklcdc Apr 4, 2019
ee4e9f6
修改dist源
Harry-zklcdc Apr 4, 2019
a1b6626
Merge pull request #3 from QingdaoU/master
Harry-zklcdc Apr 4, 2019
d00648a
Merge pull request #4 from QingdaoU/master
Harry-zklcdc Apr 5, 2019
7813c2b
修改language列表
Harry-zklcdc Apr 5, 2019
522c2fd
Merge pull request #5 from QingdaoU/master
Harry-zklcdc Apr 16, 2019
a03493f
Update README.md
Harry-zklcdc Apr 19, 2019
3c21ab9
change [Build Status]
Harry-zklcdc Apr 19, 2019
5251ef5
添加关于我们(未完成)
Apr 28, 2019
1128f62
Merge branch 'master' of https://github.com/Harry-zklcdc/OnlineJudge
Apr 28, 2019
0e1dc73
添加关于我们(未完成)
Apr 28, 2019
80fae07
添加关于我们(未完成)
Harry-zklcdc Apr 28, 2019
80e98ba
添加关于我们(未完成)
Harry-zklcdc Apr 28, 2019
5df6867
移植“编辑关于我们”至系统配置
Apr 29, 2019
1ec09a4
遵循代码规范
Harry-zklcdc Apr 29, 2019
d8e36a1
遵循代码规范
Harry-zklcdc Apr 29, 2019
22d2ab9
修改pg数据库地址
Harry-zklcdc Apr 29, 2019
8634151
fix test
Harry-zklcdc Apr 29, 2019
5370c94
修改pg数据库地址,使其可以内网访问
Harry-zklcdc Apr 29, 2019
5dbd8ee
增加“About Us API”
Harry-zklcdc May 1, 2019
0140cce
fix bugs
Harry-zklcdc May 1, 2019
d64e10f
fix bugs
Harry-zklcdc May 1, 2019
68cb328
fix'About Us API' Bug
Harry-zklcdc May 1, 2019
cf6fbdd
fix'About Us API' Bug
Harry-zklcdc May 1, 2019
2596b31
Merge remote-tracking branch 'upstream/master'
Harry-zklcdc May 1, 2019
775ece9
修改前台关于我们不存在时的返回值
Harry-zklcdc May 1, 2019
8c6ed1e
修改初始化选项
Harry-zklcdc May 1, 2019
9150053
fix bugs
Harry-zklcdc May 1, 2019
431847e
添加在线IDE功能(测试)
May 5, 2019
f606583
fix bugs
May 5, 2019
4bd5078
fix bugs
May 5, 2019
c66c31f
fix bugs
May 5, 2019
bc6ba0e
fix bugs
May 6, 2019
e53c662
fix bugs
May 6, 2019
5bd3a7f
修改在线IDE功能(测试)
May 7, 2019
0d6880d
fix bugs
May 7, 2019
4ab80fa
fix bugs
May 7, 2019
7627199
fix bugs
May 10, 2019
9b1fc05
fix bugs
May 10, 2019
13d09cc
fix bugs
May 10, 2019
12ec4df
fix bugs
May 10, 2019
79459ab
fix bugs
May 10, 2019
68eb023
添加在线IDE功能(后端已完成)
May 11, 2019
3f7aaf0
fix SubmissionList[Problem] display error
Harry-zklcdc May 18, 2019
1f5dcf4
修改中文readme
Harry-zklcdc Jul 9, 2019
13fdd1a
修改英文readme
Harry-zklcdc Jul 9, 2019
6c0cb62
修改题目排序为按display id排序
Harry-zklcdc Jul 21, 2019
fa273fb
添加看板娘api
Harry-zklcdc Aug 26, 2019
a4a49d9
fix bug
Harry-zklcdc Aug 26, 2019
d827688
fix bugs
Harry-zklcdc Aug 26, 2019
226f1da
fix bugs
Harry-zklcdc Aug 26, 2019
a7c0d8f
fix bugs
Harry-zklcdc Aug 26, 2019
ab3270e
fix bugs
Harry-zklcdc Aug 26, 2019
798776d
fix bugs
Harry-zklcdc Aug 27, 2019
9ff2324
fix bugs
Harry-zklcdc Aug 27, 2019
8720a19
fix bugs
Harry-zklcdc Aug 27, 2019
662dd60
fix bugs
Harry-zklcdc Aug 27, 2019
7e84802
fix bugs
Harry-zklcdc Sep 7, 2019
43a8e39
fix bugs
Harry-zklcdc Sep 7, 2019
970dcd5
Fix live2d's bug;Add docker images
Harry-zklcdc Sep 7, 2019
2bc5112
fix bugs
Sep 10, 2019
ed16473
增大编译时限
Harry-zklcdc Sep 30, 2019
82986de
修改密码错误返回值导致CI测试不通过问题
Harry-zklcdc Sep 30, 2019
c1224bb
fix bugs
Harry-zklcdc Sep 30, 2019
a1bd341
rm live2d plugin
Harry-zklcdc Sep 30, 2019
624fea0
Merge branch 'master' of https://github.com/Harry-zklcdc/OnlineJudge
Harry-zklcdc Sep 30, 2019
b9cf579
实现在动态获取语言编译命令
Harry-zklcdc Oct 1, 2019
cc43dc7
实现在动态获取语言编译命令
Harry-zklcdc Oct 1, 2019
1cf08f2
merge from branch 'ide'; 实现在动态获取语言编译命令
Harry-zklcdc Oct 1, 2019
7756231
修改编译和运行时间,防止导致服务器卡顿
Harry-zklcdc Oct 5, 2019
8591798
升级GCC和G++的版本
Nov 14, 2019
1bb7197
升级GCC和G++编译器
Harry-zklcdc Nov 14, 2019
0d8814d
升级GCC和G++编译器
Harry-zklcdc Nov 15, 2019
9bd3fb3
Add languages
Harry-zklcdc Nov 16, 2019
2d8a3c7
fix judge_languages
Harry-zklcdc Jan 21, 2020
62e428d
Add HSTS
Harry-zklcdc Jan 22, 2020
5721a65
update readme.md
Harry-zklcdc Jan 22, 2020
2542b00
[Add] Order by Display ID
Harry-zklcdc Apr 19, 2020
5acae1a
[Add] Sighin Function
Harry-zklcdc Apr 19, 2020
e4611f9
[Fix] Flake8 Bugs
Harry-zklcdc Apr 19, 2020
2075499
[Fix] Potential Bugs
Harry-zklcdc Apr 19, 2020
4579d18
[Fix] Set Time_Zone to Asia/Shanghai
Harry-zklcdc Apr 19, 2020
7bba8ea
[Add] Upgrade System
Harry-zklcdc Apr 20, 2020
7b0e0d5
[Fix] Problem's Experience Add Error
Harry-zklcdc Apr 20, 2020
267a069
[Fix] OI Problem Experience Add Error
Harry-zklcdc Apr 20, 2020
a6a83cf
[Fix] last_sighin_time is not default to make New User couldn't Sighin
Harry-zklcdc Apr 21, 2020
8a7a1d6
[Fix] Flake8 Error
Harry-zklcdc Apr 21, 2020
e6ea5d0
[Fix] Accept Problem Add Experience Possible Error
Harry-zklcdc Apr 23, 2020
5020349
[Fix] Change Sample picture
Harry-zklcdc Apr 29, 2020
52f4ba0
[Fix] Change Sample picture
Harry-zklcdc Apr 29, 2020
a80bcdb
[Fix] Reduce Memory Usage
Harry-zklcdc May 2, 2020
464ed5d
Merge branch 'master' of https://github.com/Harry-zklcdc/OnlineJudge
Harry-zklcdc May 2, 2020
f193c5c
[Add] Release Note
Harry-zklcdc May 2, 2020
77dcfe4
[Fix] Modify the Upgrade URL
Harry-zklcdc May 2, 2020
faffd7f
[Add] Release Note
Harry-zklcdc May 2, 2020
ad43ae7
[Fix] Release Note
Harry-zklcdc May 3, 2020
e696e87
[Fix] Release Note
Harry-zklcdc May 3, 2020
a8d7416
[Fix] Release Note
Harry-zklcdc May 3, 2020
18a024b
[Fix] Release Note
Harry-zklcdc May 3, 2020
2c09460
[Add] Release Note
Harry-zklcdc May 3, 2020
ef19b30
[Add] Release Note
Harry-zklcdc May 3, 2020
ab63ed4
Merge remote-tracking branch 'upstream/master'
Harry-zklcdc May 6, 2020
73475e7
[Fix] Expand Compile Time Limit
Harry-zklcdc May 6, 2020
4462910
[Add] Release Note
Harry-zklcdc May 6, 2020
1249bb4
Merge branch 'master' of https://github.com/QingdaoU/OnlineJudge into…
Harry-zklcdc Jul 8, 2020
d0a5c53
Merge branch 'QingdaoU-master'
Harry-zklcdc Jul 8, 2020
6f6ea3c
[Fix] Format
Harry-zklcdc Jul 8, 2020
eff19aa
[Fix] languages.py
Harry-zklcdc Jul 16, 2020
020de76
Merge remote-tracking branch 'upstream/master'
Harry-zklcdc Jul 16, 2020
7676ed9
[Fix] Language information
Harry-zklcdc Jul 16, 2020
9c58047
[Upgrade] data.json
Harry-zklcdc Jul 16, 2020
6d09da3
[Add] Forum
Harry-zklcdc Jul 19, 2020
e825a16
[Fix] Format Problem
Harry-zklcdc Jul 19, 2020
2ccd75f
[Fix] Reduce time complexity
Harry-zklcdc Jul 20, 2020
ff6bf78
[Del] Delete unnecessary Serializer
Harry-zklcdc Jul 20, 2020
e28a522
[Fix] Define Floor code logic to Reduce Time/Space complexity
Harry-zklcdc Jul 20, 2020
65ba399
[Fix] ForumDelete
Harry-zklcdc Jul 30, 2020
60e8910
[Add] ForumPost Top/Light/Nice
Harry-zklcdc Jul 31, 2020
17530c4
[Remove] ForumReply Useless Model
Harry-zklcdc Jul 31, 2020
8f15bc8
[Add] Forum Reply Delete
Harry-zklcdc Jul 31, 2020
eac6844
[Fix] Sync Delete Reply when delete Post
Harry-zklcdc Jul 31, 2020
dd071bb
[Add] Forum Post/Reply Limit per min
Harry-zklcdc Jul 31, 2020
d707ab2
[Remove] ForumPost Useless Key
Harry-zklcdc Aug 1, 2020
c6f9fcd
[Add] Forum Sort Information
Harry-zklcdc Aug 1, 2020
7d5bbdf
[Add] Forum Post/Reply Permission
Harry-zklcdc Aug 1, 2020
839929a
[Fix] Conf Test Error
Harry-zklcdc Aug 1, 2020
370bc77
[Add] IDE tasks throttling
Harry-zklcdc Aug 1, 2020
ecb62c2
[Add] Forum Reply user'grade
Harry-zklcdc Aug 2, 2020
9df3237
[Fix] SuperAdmin decide
Harry-zklcdc Aug 2, 2020
bae5528
[Add] Custom User Title/Color
Harry-zklcdc Aug 2, 2020
cd3c299
[Add] Experience Rank
Harry-zklcdc Aug 2, 2020
a576dc7
[Add] Import real_name when Import Users
Harry-zklcdc Aug 2, 2020
c137e0b
[Fix] Test Error
Harry-zklcdc Aug 2, 2020
07bf2e2
[Fix] Contest Rank User's Title
Harry-zklcdc Aug 2, 2020
0fac47b
[Fix] Forum Reply return Error
Harry-zklcdc Aug 2, 2020
5e42af2
[Update] data.json
Harry-zklcdc Aug 2, 2020
2434ed4
[Fix] Remove Superadmin Post/Reply throttling && Fix Post Problem
Harry-zklcdc Aug 3, 2020
cfed97f
[Add] Send Email when Reply
Harry-zklcdc Aug 4, 2020
79b72e8
[Update] data.json
Harry-zklcdc Aug 4, 2020
236ae72
[Fix] Submission in Contest don't have User Title
Harry-zklcdc Aug 4, 2020
9891670
[Fix] Reply Email Error address
Harry-zklcdc Aug 4, 2020
7864fd4
[Fix] Username don't match
Harry-zklcdc Aug 7, 2020
a0fee49
[Opt] Optimize query performance
Harry-zklcdc Aug 7, 2020
b18f2f8
Bump urllib3 from 1.24.1 to 1.26.5 in /deploy
dependabot[bot] Jun 2, 2021
5dccd3e
Bump djangorestframework from 3.8.2 to 3.11.2 in /deploy
dependabot[bot] Mar 19, 2021
59d8df6
Bump pillow from 5.4.1 to 8.2.0 in /deploy
dependabot[bot] Jun 8, 2021
7c43429
Bump django from 2.1.7 to 2.2.24 in /deploy
dependabot[bot] Jun 19, 2021
789b9fb
[Upgrade] Upgrade Redis Version to 6.0
Harry-zklcdc Jun 20, 2021
4c39a68
[Fix] CDN problem
Harry-zklcdc Jun 20, 2021
0a2fb56
[Fix] Depend Error
Harry-zklcdc Jun 20, 2021
0254541
Merge remote-tracking branch 'upstream/master'
Harry-zklcdc Jul 11, 2021
24cd0e4
[Upgrade] upgrade_data.json
Harry-zklcdc Jul 11, 2021
f3a0579
[Add] Pypy compile / run config
Harry-zklcdc Jul 11, 2021
7fc60f6
[Update] Upgrade_data.json
Harry-zklcdc Jul 11, 2021
7d5bc32
[Fix] CDN Problem
Harry-zklcdc Jul 11, 2021
2eb44c9
[Fix] Runtime Error
Harry-zklcdc Jul 12, 2021
3c942f4
[Add] Support Node.js and PHP
Harry-zklcdc Jul 12, 2021
f4534a5
[Fix] languages config
Harry-zklcdc Jul 12, 2021
a3a216c
[Update] Upgrade_data.json
Harry-zklcdc Jul 12, 2021
3b13d7d
[Update] Upgrade_data.json
Harry-zklcdc Jul 12, 2021
1e631e2
[Fix] CDN Problem
Harry-zklcdc Jul 12, 2021
dd2a52b
[Fix] languages config
Harry-zklcdc Jul 12, 2021
9be5ea8
[Fix] languages config
Harry-zklcdc Jul 12, 2021
18d672c
[Update] Upgrade_data.json
Harry-zklcdc Jul 18, 2021
a886e2b
[Update] Upgrade_data.json
Harry-zklcdc Aug 6, 2021
27b29b9
[Update] Upgrade_data.json
Harry-zklcdc Aug 6, 2021
186dad9
[Update] Upgrade_data.json
Harry-zklcdc Aug 6, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
移植“编辑关于我们”至系统配置
Harry-zklcdc committed Apr 29, 2019
commit 5df6867540469eef88ba0aa6af1e8fd1e5b5feeb
19 changes: 1 addition & 18 deletions announcement/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -34,21 +34,4 @@ class Migration(migrations.Migration):
},
),
]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

多了空行


operations = [
migrations.CreateModel(
name='Announcement',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=50)),
('content', utils.models.RichTextField()),
('create_time', models.DateTimeField(auto_now_add=True)),
('last_update_time', models.DateTimeField(auto_now=True)),
('visible', models.BooleanField(default=True)),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
options={
'db_table': 'aboutus',
},
),
]

9 changes: 0 additions & 9 deletions announcement/models.py
Original file line number Diff line number Diff line change
@@ -16,12 +16,3 @@ class Announcement(models.Model):
class Meta:
db_table = "announcement"
ordering = ("-create_time",)

class AboutUs(models.Model):
# HTML
content = RichTextField()
created_by = models.ForeignKey(User, on_delete=models.CASCADE)
last_update_time = models.DateTimeField(auto_now=True)

class Meta:
db_table = "aboutus"
19 changes: 1 addition & 18 deletions announcement/serializers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from utils.api import serializers
from utils.api._serializers import UsernameSerializer

from .models import (Announcement, AboutUs)
from .models import Announcement


class CreateAnnouncementSerializer(serializers.Serializer):
@@ -24,20 +24,3 @@ class EditAnnouncementSerializer(serializers.Serializer):
content = serializers.CharField(max_length=1024 * 1024 * 8)
visible = serializers.BooleanField()


class CreateAboutUsSerializer(serializers.Serializer):
title = serializers.CharField(max_length=64)
content = serializers.CharField(max_length=1024 * 1024 * 8)


class AboutUsSerializer(serializers.ModelSerializer):
created_by = UsernameSerializer()

class Meta:
model = AboutUs
fields = "__all__"


class EditAboutUsSerializer(serializers.Serializer):
title = serializers.CharField(max_length=64)
content = serializers.CharField(max_length=1024 * 1024 * 8)
3 changes: 1 addition & 2 deletions announcement/urls/admin.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from django.conf.urls import url

from ..views.admin import (AnnouncementAdminAPI, AboutUsAdminAPI)
from ..views.admin import AnnouncementAdminAPI

urlpatterns = [
url(r"^announcement/?$", AnnouncementAdminAPI.as_view(), name="announcement_admin_api"),
url(r"^aboutus/?$", AboutUsAdminAPI.as_view(), name="aboutus_admin_api"),
]
3 changes: 1 addition & 2 deletions announcement/urls/oj.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from django.conf.urls import url

from ..views.oj import (AnnouncementAPI, AboutUsAPI)
from ..views.oj import AnnouncementAPI

urlpatterns = [
url(r"^announcement/?$", AnnouncementAPI.as_view(), name="announcement_api"),
url(r"^aboutus/?$", AboutUsAPI.as_view(), name="aboutus_api"),
]
60 changes: 3 additions & 57 deletions announcement/views/admin.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from account.decorators import super_admin_required
from utils.api import APIView, validate_serializer

from announcement.models import (Announcement, AboutUs)
from announcement.serializers import (AnnouncementSerializer, CreateAnnouncementSerializer, EditAnnouncementSerializer,
AboutUsSerializer, EditAboutUsSerializer, CreateAboutUsSerializer)
from announcement.models import Announcement
from announcement.serializers import (AnnouncementSerializer, CreateAnnouncementSerializer,
EditAnnouncementSerializer)


class AnnouncementAdminAPI(APIView):
@@ -54,57 +54,3 @@ def get(self, request):
if request.GET.get("visible") == "true":
announcement = announcement.filter(visible=True)
return self.success(self.paginate_data(request, announcement, AnnouncementSerializer))

@super_admin_required
def delete(self, request):
if request.GET.get("id"):
Announcement.objects.filter(id=request.GET["id"]).delete()
return self.success()


class AboutUsAdminAPI(APIView):
@validate_serializer(CreateAboutUsSerializer)
@super_admin_required
def post(self, request):
"""
publish aboutus
"""
data = request.data
aboutus = AboutUs.objects.create(title=data["title"],
content=data["content"],
created_by=request.user)
return self.success(AboutUsSerializer(aboutus).data)

@validate_serializer(EditAboutUsSerializer)
@super_admin_required
def put(self, request):
"""
edit AboutUs
"""
data = request.data
try:
aboutus = AboutUs.objects.get(title=data.pop("title"))
except AboutUs.DoesNotExist:
return self.error("AboutUs does not exist")

for k, v in data.items():
setattr(aboutus, k, v)
aboutus.save()

return self.success(AboutUsSerializer(aboutus).data)

@super_admin_required
def get(self, request):
"""
get aboutus list / get one aboutus
"""
aboutus_id = request.GET.get("title")
if aboutus_id:
try:
aboutus = AboutUs.objects.get(title=aboutus_id)
return self.success(AboutUsSerializer(aboutus).data)
except AboutUs.DoesNotExist:
return self.error("AboutUs does not exist")
aboutus = AboutUs.objects.all()
return self.success(self.paginate_data(request, aboutus, AboutUsSerializer))

9 changes: 2 additions & 7 deletions announcement/views/oj.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
from utils.api import APIView

from announcement.models import (Announcement, AboutUs)
from announcement.serializers import (AnnouncementSerializer, AboutUsSerializer)
from announcement.models import Announcement
from announcement.serializers import AnnouncementSerializer


class AnnouncementAPI(APIView):
def get(self, request):
announcements = Announcement.objects.filter(visible=True)
return self.success(self.paginate_data(request, announcements, AnnouncementSerializer))

class AboutUsAPI(APIView):
def get(self, request):
aboutus = AboutUs.objects.filter()
return self.success(self.paginate_data(request, aboutus, AboutUsSerializer))