-
+
- 
+
diff --git a/seahub/templates/snippets/notifications_popup.html b/seahub/templates/snippets/notifications_popup.html
new file mode 100644
index 0000000000..828ff66b42
--- /dev/null
+++ b/seahub/templates/snippets/notifications_popup.html
@@ -0,0 +1,59 @@
+{% load avatar_tags seahub_tags i18n %}
+{% trans "Notifications" %}
-
-
- -
-
-
- {% avatar request.user 32 %}
-
{% blocktrans with author=request.user.username %}{{author}} posted a new discussion in seafile{% endblocktrans %}
-@lj 这个是德文站点 http://www.seafile-server.de 看看怎么在我们的 seafile.com 页面上加个链接
-10 hours ago
-
- -
- {% avatar request.user 32 %}
-
{% blocktrans with author=request.user.username %}{{author}} posted a new discussion in seafile{% endblocktrans %}
-@lj 这个是德文站点 http://www.seafile-server.de 看看怎么在我们的 seafile.com 页面上加个链接
-10 hours ago
-
-
+
+ 
{% trans "Notifications" %}
+
+
+-
+ {% for notice in notices %}
+
+ {% if not notice.seen %}
+
- + {% else %} +
-
+ {% endif %}
+
+ {% if notice.msg_from %}
+ {% avatar notice.msg_from 32 %}
+ {% else %}
+
+ {% endif %} + + {% if notice.is_group_msg %} +
{{ notice.format_group_message_title|safe }} + {% if notice.format_group_message_detail %} + {{ notice.format_group_message_detail|safe }} + {% endif %} +
+ + {% elif notice.is_grpmsg_reply %} +{{ notice.format_grpmsg_reply_title|safe }} + {% if notice.format_grpmsg_reply_detail %} + {{ notice.format_grpmsg_reply_detail|safe }} + {% endif %} +
+ + {% elif notice.is_file_uploaded_msg %} +{{ notice.format_file_uploaded_msg|safe }}
+ + {% elif notice.is_repo_share_msg %} +{{ notice.format_repo_share_msg|safe }}
+ + {% elif notice.is_priv_file_share_msg %} +{{ notice.format_priv_file_share_msg|safe }}
+ + {% elif notice.is_user_message %} +{{ notice.format_user_message_title|safe }} + {% if notice.format_user_message_detail %} + {{ notice.format_user_message_detail|safe }} + {% endif %} +
+ + {% elif notice.is_group_join_request %} +{{ notice.format_group_join_request|safe }}
+ + {% endif %} +{{ notice.timestamp|translate_seahub_time }}
+
+ {% endfor %}
+
diff --git a/seahub/urls.py b/seahub/urls.py
index 30b7e0ce6e..67c777f8d4 100644
--- a/seahub/urls.py
+++ b/seahub/urls.py
@@ -144,6 +144,9 @@ urlpatterns = patterns('',
url(r'^ajax/contacts/$', get_contacts, name='get_contacts'),
url(r'^ajax/upload-file-done/$', upload_file_done, name='upload_file_done'),
url(r'^ajax/unseen-notices-count/$', unseen_notices_count, name='unseen_notices_count'),
+ url(r'^ajax/get_popup_notices/$', get_popup_notices, name='get_popup_notices'),
+ url(r'^ajax/set_notices_seen/$', set_notices_seen, name='set_notices_seen'),
+ url(r'^ajax/set_notice_seen_by_id/$', set_notice_seen_by_id, name='set_notice_seen_by_id'),
url(r'^ajax/space_and_traffic/$', space_and_traffic, name='space_and_traffic'),
url(r'^ajax/my-shared-and-group-repos/$', my_shared_and_group_repos, name='my_shared_and_group_repos'),
url(r'^ajax/events/$', events, name="events"),
diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py
index 6ee204adf3..266e907c93 100644
--- a/seahub/views/ajax.py
+++ b/seahub/views/ajax.py
@@ -39,6 +39,7 @@ from seahub.utils import check_filename_with_rename, EMPTY_SHA1, \
get_repo_last_modify, gen_file_upload_url, is_org_context, \
get_org_user_events, get_user_events
from seahub.utils.star import star_file, unstar_file
+from seahub.avatar.util import get_default_avatar_url
# Get an instance of a logger
logger = logging.getLogger(__name__)
@@ -1273,6 +1274,126 @@ def unseen_notices_count(request):
result['count'] = count
return HttpResponse(json.dumps(result), content_type=content_type)
+@login_required
+def get_popup_notices(request):
+ """Get user's unseen notices:
+
+ Arguments:
+ - `request`:
+ """
+ if not request.is_ajax():
+ raise Http404
+
+ content_type = 'application/json; charset=utf-8'
+ username = request.user.username
+
+ count = UserNotification.objects.count_unseen_user_notifications(username)
+ result_notices = []
+ unseen_notices = []
+ seen_notices = []
+ list_num = 5
+
+ if count == 0:
+ seen_notices = UserNotification.objects.filter(to_user = username)[:list_num]
+ elif count > list_num:
+ unseen_notices = UserNotification.objects.filter(to_user = username, seen = False)
+ else:
+ unseen_notices = UserNotification.objects.filter(to_user = username, seen = False)
+ seen_notices = UserNotification.objects.filter(
+ to_user = username,
+ seen = True)[:list_num-count]
+
+ result_notices += unseen_notices
+ result_notices += seen_notices
+
+ for notice in result_notices:
+ if notice.is_user_message():
+ d = notice.user_message_detail_to_dict()
+ notice.msg_from = d.get('msg_from')
+ continue
+
+ elif notice.is_group_msg():
+ d = json.loads(notice.detail)
+ notice.msg_from = d['msg_from']
+ continue
+
+ elif notice.is_grpmsg_reply():
+ d = json.loads(notice.detail)
+ notice.msg_from = d['reply_from']
+ continue
+
+ elif notice.is_file_uploaded_msg():
+ d = json.loads(notice.detail)
+ notice.default_avatar_url = get_default_avatar_url()
+ continue
+
+ elif notice.is_repo_share_msg():
+ d = json.loads(notice.detail)
+ notice.msg_from = d['share_from']
+ continue
+
+ elif notice.is_priv_file_share_msg():
+ d = json.loads(notice.detail)
+ notice.msg_from = d['share_from']
+ continue
+
+ elif notice.is_group_join_request():
+ d = json.loads(notice.detail)
+ notice.msg_from = d['username']
+ continue
+
+ else:
+ pass
+
+ ctx_notices = {"notices": result_notices}
+
+ notifications_popup_html = render_to_string(
+ 'snippets/notifications_popup.html', ctx_notices,
+ context_instance=RequestContext(request))
+
+ return HttpResponse(json.dumps({"notifications_popup_html": notifications_popup_html}),
+ content_type=content_type)
+
+@login_required
+def set_notices_seen(request):
+ """Set user's notices seen:
+
+ Arguments:
+ - `request`:
+ """
+ if not request.is_ajax():
+ raise Http404
+
+ content_type = 'application/json; charset=utf-8'
+ username = request.user.username
+
+ unseen_notices = UserNotification.objects.filter(to_user = username, seen = False)
+ for notice in unseen_notices:
+ notice.seen = True
+ notice.save()
+
+ return HttpResponse(json.dumps({'success': True}), content_type=content_type)
+
+@login_required
+def set_notice_seen_by_id(request):
+ """
+
+ Arguments:
+ - `request`:
+ """
+ if not request.is_ajax():
+ raise Http404
+
+ content_type = 'application/json; charset=utf-8'
+ notice_id = request.GET.get('notice_id')
+
+ notice = UserNotification.objects.get(id=notice_id)
+ if notice.seen == False:
+ notice.seen = True
+ notice.save()
+
+ return HttpResponse(json.dumps({'success': True}), content_type=content_type)
+
@login_required
def repo_remove(request, repo_id):
if not request.is_ajax():