From 2e4379c1b9480f38fc875fa9c42d16c698e70a66 Mon Sep 17 00:00:00 2001 From: sxw Date: Wed, 9 Dec 2015 21:08:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=80=85=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/group/group.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/src/oj/group/group.html b/template/src/oj/group/group.html index 3d9fa23c..704d886b 100644 --- a/template/src/oj/group/group.html +++ b/template/src/oj/group/group.html @@ -15,7 +15,7 @@

{{ group.name }}

发布时间 : {{ group.create_time }}   - 创建者 : {{ group.admin }} + 创建者 : {{ group.created_by }}

From 7f38db660c14c288b4c529bc4929c9030ba90ee7 Mon Sep 17 00:00:00 2001 From: sxw Date: Wed, 9 Dec 2015 21:18:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=9A=84=E5=B0=8F=E7=BB=84=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8A=A0=E5=85=A5=E5=B0=8F=E7=BB=84=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/group/group.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/template/src/oj/group/group.html b/template/src/oj/group/group.html index 704d886b..003dd80c 100644 --- a/template/src/oj/group/group.html +++ b/template/src/oj/group/group.html @@ -25,6 +25,7 @@

{{ group.description|safe }}

+ {% if not joined %}
{% if group.join_group_setting %} @@ -34,10 +35,13 @@
{% endif %} +
+ + {% endif %} {% endblock %} {% block js_block %} From 804add6a03ade3a176ce1d833f7bb6290d6524f2 Mon Sep 17 00:00:00 2001 From: sxw Date: Wed, 9 Dec 2015 21:18:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=9A=84=E5=B0=8F=E7=BB=84=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8A=A0=E5=85=A5=E5=B0=8F=E7=BB=84=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- group/views.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/group/views.py b/group/views.py index 29f0a49c..fd639de7 100644 --- a/group/views.py +++ b/group/views.py @@ -298,7 +298,12 @@ def group_page(request, group_id): group = Group.objects.get(id=group_id, visible=True) except Group.DoesNotExist: return error_page(request, u"小组不存在") - return render(request, "oj/group/group.html", {"group": group}) + joined = True + try: + UserGroupRelation.objects.get(user=request.user, group=group) + except UserGroupRelation.DoesNotExist: + joined = False + return render(request, "oj/group/group.html", {"group": group, "joined": joined}) @login_required From eacb26eed0528e5db021168008f392fb85411158 Mon Sep 17 00:00:00 2001 From: sxw Date: Wed, 9 Dec 2015 21:48:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E6=89=8D=E8=83=BD=E7=9C=8B=E5=88=B0=E9=9A=90=E8=97=8F=E5=B0=8F?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- group/serializers.py | 1 + group/views.py | 5 +++-- static/src/js/app/admin/group/groupDetail.js | 5 +++-- template/src/admin/group/group_detail.html | 22 +++++++++++++------- template/src/oj/account/user_index.html | 12 ++++++----- 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/group/serializers.py b/group/serializers.py index 27490d87..377d56d6 100644 --- a/group/serializers.py +++ b/group/serializers.py @@ -17,6 +17,7 @@ class EditGroupSerializer(serializers.Serializer): name = serializers.CharField(max_length=20) description = serializers.CharField(max_length=300) join_group_setting = serializers.IntegerField() + visible = serializers.BooleanField() class CreateJoinGroupRequestSerializer(serializers.Serializer): diff --git a/group/views.py b/group/views.py index fd639de7..5c2797b1 100644 --- a/group/views.py +++ b/group/views.py @@ -25,7 +25,7 @@ class GroupAPIViewBase(object): 管理员可以查询所有的小组，其他用户查询自己创建的自傲组 """ if request.user.admin_type == SUPER_ADMIN: - group = Group.objects.get(id=group_id, visible=True) + group = Group.objects.get(id=group_id) else: group = Group.objects.get(id=group_id, visible=True, admin=request.user) return group @@ -36,7 +36,7 @@ class GroupAPIViewBase(object): 如果是管理员，就返回他创建的全部小组 """ if request.user.admin_type == SUPER_ADMIN: - groups = Group.objects.filter(visible=True) + groups = Group.objects.filter() else: groups = Group.objects.filter(admin=request.user, visible=True) return groups @@ -83,6 +83,7 @@ class GroupAdminAPIView(APIView, GroupAPIViewBase): group.name = data["name"] group.description = data["description"] group.join_group_setting = data["join_group_setting"] + group.visible = data["visible"] group.save() except IntegrityError: return error_response(u"小组名已经存在") diff --git a/static/src/js/app/admin/group/groupDetail.js b/static/src/js/app/admin/group/groupDetail.js index 9edc2355..6df05afa 100644 --- a/static/src/js/app/admin/group/groupDetail.js +++ b/static/src/js/app/admin/group/groupDetail.js @@ -18,7 +18,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, name: "", description: "", checkedSetting: "0", - + visible: true, getNext: function () { if (!vm.nextPage) return; @@ -103,6 +103,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, vm.name = data.data.name; vm.description = data.data.description; vm.checkedSetting = data.data.join_group_setting.toString(); + vm.visible = data.data.visible; } else { bsAlert(data.data); @@ -123,7 +124,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, url: "/api/admin/group/", method: "put", data: {group_id: group_id, name: name, description: description, - join_group_setting: join_group_setting}, + join_group_setting: join_group_setting, visible:vm.visible}, dataType: "json", success: function (data) { if (!data.code) { diff --git a/template/src/admin/group/group_detail.html b/template/src/admin/group/group_detail.html index cb1be1fe..71e54b5c 100644 --- a/template/src/admin/group/group_detail.html +++ b/template/src/admin/group/group_detail.html @@ -49,18 +49,24 @@
-
+
- - - 允许任何人加入 - 提交请求后管理员审核 - 不允许任何人加入 - +
+ + +
+ +
+
+
+ +
+
-
diff --git a/template/src/oj/account/user_index.html b/template/src/oj/account/user_index.html index 9ae7178e..7a481aa6 100644 --- a/template/src/oj/account/user_index.html +++ b/template/src/oj/account/user_index.html @@ -22,14 +22,16 @@ {% if user.userprofile.mood %}

{{ user.userprofile.mood }}

{% endif %} - {% if user.userprofile.school %} -

{{ user.userprofile.school }}

- {% endif %} +
- + {% if user.userprofile.school %} +

+ {{ user.userprofile.school }} +

+ {% endif %} {% if user.userprofile.blog %} -

+

{{ blog_link }}

{% endif %} From 299d2a48e0994b5fba0c0e1489315194b301afd3 Mon Sep 17 00:00:00 2001 From: sxw Date: Wed, 9 Dec 2015 21:57:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E4=BB=BB=E4=BD=95=E4=BA=BA=E5=8A=A0=E5=85=A5=E7=9A=84=E5=B0=8F?= =?UTF-8?q?=E7=BB=84=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/group/group.html | 4 ++-- template/src/oj/group/group_list.html | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/template/src/oj/group/group.html b/template/src/oj/group/group.html index 003dd80c..bbf6c32b 100644 --- a/template/src/oj/group/group.html +++ b/template/src/oj/group/group.html @@ -28,13 +28,13 @@ {% if not joined %}
- {% if group.join_group_setting %} + {% ifequal group.join_group_setting 1 %}
- {% endif %} + {% endifequal %}
diff --git a/template/src/oj/group/group_list.html b/template/src/oj/group/group_list.html index 03e425cb..575102bd 100644 --- a/template/src/oj/group/group_list.html +++ b/template/src/oj/group/group_list.html @@ -34,11 +34,15 @@ {{ item.id }} {{ item.name }} - {% if item.join_group_setting %} + {% ifequal item.join_group_setting 1 %} 需要申请 - {% else %} + {% endifequal %} + {% ifequal item.join_group_setting 0 %} 无需申请 - {% endif %} + {% endifequal %} + {% ifequal item.join_group_setting 2 %} + 不允许加入 + {% endifequal %} {{ item.created_by }} {{ item.create_time }}