QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 16:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[前台]修改小组逻辑,修正之前加入无需申请的小组的时候错误的提示,无需申请的小组取消申请列表栏

Browse Source
This commit is contained in:
esp 2015-09-03 20:25:09 +08:00
parent bfde3b976b
commit a16198b861
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group/serializers.py
View File

@ -21,7 +21,7 @@ class EditGroupSerializer(serializers.Serializer):
class CreateJoinGroupRequestSerializer(serializers.Serializer): class CreateJoinGroupRequestSerializer(serializers.Serializer):
group_id = serializers.IntegerField() group_id = serializers.IntegerField()
message = serializers.CharField(max_length=30) message = serializers.CharField(max_length=30, required=False)
class JoinGroupRequestSerializer(serializers.ModelSerializer): class JoinGroupRequestSerializer(serializers.ModelSerializer):

4
group/views.py
View File

@ -183,6 +183,8 @@ class JoinGroupAPIView(APIView):
else: else:
return error_response(u"你已经是小组成员了") return error_response(u"你已经是小组成员了")
elif group.join_group_setting == 1: elif group.join_group_setting == 1:
if not data["message"]:
return error_response(u"message : 该字段是必填项。")
try: try:
JoinGroupRequest.objects.get(user=request.user, group=group, status=False) JoinGroupRequest.objects.get(user=request.user, group=group, status=False)
return error_response(u"你已经提交过申请了，请等待审核") return error_response(u"你已经提交过申请了，请等待审核")
@ -295,6 +297,7 @@ def group_page(request, group_id):
return error_page(request, u"小组不存在") return error_page(request, u"小组不存在")
return render(request, "oj/group/group.html", {"group": group}) return render(request, "oj/group/group.html", {"group": group})
@login_required @login_required
def application_list_page(request, group_id): def application_list_page(request, group_id):
try: try:
@ -305,6 +308,7 @@ def application_list_page(request, group_id):
return render(request, "oj/group/my_application_list.html", return render(request, "oj/group/my_application_list.html",
{"group": group, "applications": applications}) {"group": group, "applications": applications})
@login_required @login_required
def application_page(request, request_id): def application_page(request, request_id):
try: try:

11
template/src/oj/group/group.html
View File

@ -4,8 +4,11 @@
<div class="container main"> <div class="container main">
<ul class="nav nav-tabs nav-tabs-google"> <ul class="nav nav-tabs nav-tabs-google">
<li role="presentation" class="active"> <li role="presentation" class="active">
<a href="/group/{{ group.id }}/">详细信息</a></li> <a href="/group/{{ group.id }}/">详细信息</a>
</li>
{% if group.join_group_setting %}
<li role="presentation"><a href="/group/{{ group.id }}/applications/">我的申请</a></li> <li role="presentation"><a href="/group/{{ group.id }}/applications/">我的申请</a></li>
{% endif %}
</ul> </ul>
<h2 class="text-center">{{ group.name }}</h2> <h2 class="text-center">{{ group.name }}</h2>
@ -30,7 +33,11 @@
</div> </div>
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<button class="btn btn-primary" id="sendApplication">申请加入</button> <button class="btn btn-primary" id="sendApplication">
{% if group.join_group_setting %}
申请
{% endif %}
加入</button>
</div> </div>
</div> </div>
</div> </div>