From 1c81544d443683d3f9ddd774feafef7f47e5c799 Mon Sep 17 00:00:00 2001 From: "tangshuangpku@hotmail.com" Date: Tue, 7 Jun 2016 19:13:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/templates/notification.html | 75 +++++++++++++++++++++-- web/webViews/notification/notification.py | 4 +- 2 files changed, 71 insertions(+), 8 deletions(-) diff --git a/web/templates/notification.html b/web/templates/notification.html index 971fc6b..ab95f4d 100644 --- a/web/templates/notification.html +++ b/web/templates/notification.html @@ -68,8 +68,8 @@ {{ notify['status'] }} details  - edit  - delete + edit  + delete
-

Title

- +

Title

{{ notify['title'] }}


-

Content

- +

Content

{{ notify['content'] }}

@@ -99,6 +97,71 @@
+ + {% endfor %} diff --git a/web/webViews/notification/notification.py b/web/webViews/notification/notification.py index 9be8695..b76be7c 100644 --- a/web/webViews/notification/notification.py +++ b/web/webViews/notification/notification.py @@ -11,9 +11,9 @@ class NotificationView(normalView): @classmethod def get(cls): result = dockletRequest.post('/notification/list/') + groups = dockletRequest.post('/user/groupNameList/')['groups'] notifications = result['data'] - notification_titles = [notify['title'] for notify in notifications] - return cls.render(cls.template_path, notifications=notifications, notification_titles=notification_titles) + return cls.render(cls.template_path, notifications=notifications, groups=groups) class CreateNotificationView(normalView):