Hopiu/django-notifications
1
0
Fork 0
mirror of https://github.com/Hopiu/django-notifications.git synced 2026-05-02 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Django 2.0 support

Browse source
This commit is contained in:
John Pham 2017-12-07 08:38:29 +08:00
parent f3479a48fd
commit 652222d2b8
9 changed files with 69 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.travis.yml
View file

@ -9,6 +9,8 @@ env:
- DJANGO=1.8
- DJANGO=1.9
- DJANGO=1.10
- DJANGO=1.11
- DJANGO=2.0
install:
# command to install dependencies
- "pip install coveralls"
@ -26,5 +28,14 @@ matrix:
env: DJANGO=1.9
- python: "3.3"
env: DJANGO=1.10
- python: "3.3"
env: DJANGO=1.11
- python: "3.3"
env: DJANGO=2.0
- python: "2.7"
env: DJANGO=2.0
after_success:
- coveralls

2
README.rst
View file

@ -29,7 +29,7 @@ Requirements
============
- Python 2.7, 3.3, 3.4, 3.5
- Django 1.7, 1.8, 1.9, 1.10
- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0
Installation
============

10
notifications/migrations/0001_initial.py
View file

@ -18,7 +18,7 @@ class Migration(migrations.Migration):
name='Notification',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('level', models.CharField(default=b'info', max_length=20, choices=[(b'success', b'success'), (b'info', b'info'), (b'warning', b'warning'), (b'error', b'error')])),
('level', models.CharField(default='info', max_length=20, choices=[('success', 'success'), ('info', 'info'), ('warning', 'warning'), ('error', 'error')])),
('unread', models.BooleanField(default=True)),
('actor_object_id', models.CharField(max_length=255)),
('verb', models.CharField(max_length=255)),
@ -27,10 +27,10 @@ class Migration(migrations.Migration):
('action_object_object_id', models.CharField(max_length=255, null=True, blank=True)),
('timestamp', models.DateTimeField(default=django.utils.timezone.now)),
('public', models.BooleanField(default=True)),
('action_object_content_type', models.ForeignKey(related_name=b'notify_action_object', blank=True, to='contenttypes.ContentType', null=True)),
('actor_content_type', models.ForeignKey(related_name=b'notify_actor', to='contenttypes.ContentType')),
('recipient', models.ForeignKey(related_name=b'notifications', to=settings.AUTH_USER_MODEL)),
('target_content_type', models.ForeignKey(related_name=b'notify_target', blank=True, to='contenttypes.ContentType', null=True)),
('action_object_content_type', models.ForeignKey(related_name='notify_action_object', blank=True, to='contenttypes.ContentType', null=True, on_delete=models.CASCADE)),
('actor_content_type', models.ForeignKey(related_name='notify_actor', to='contenttypes.ContentType', on_delete=models.CASCADE)),
('recipient', models.ForeignKey(related_name='notifications', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
('target_content_type', models.ForeignKey(related_name='notify_target', blank=True, to='contenttypes.ContentType', null=True, on_delete=models.CASCADE)),
],
options={
'ordering': ('-timestamp',),

8
notifications/models.py
View file

@ -169,22 +169,22 @@ class Notification(models.Model):
LEVELS = Choices('success', 'info', 'warning', 'error')
level = models.CharField(choices=LEVELS, default=LEVELS.info, max_length=20)
recipient = models.ForeignKey(settings.AUTH_USER_MODEL, blank=False, related_name='notifications')
recipient = models.ForeignKey(settings.AUTH_USER_MODEL, blank=False, related_name='notifications', on_delete=models.CASCADE)
unread = models.BooleanField(default=True, blank=False)
actor_content_type = models.ForeignKey(ContentType, related_name='notify_actor')
actor_content_type = models.ForeignKey(ContentType, related_name='notify_actor', on_delete=models.CASCADE)
actor_object_id = models.CharField(max_length=255)
actor = GenericForeignKey('actor_content_type', 'actor_object_id')
verb = models.CharField(max_length=255)
description = models.TextField(blank=True, null=True)
target_content_type = models.ForeignKey(ContentType, related_name='notify_target', blank=True, null=True)
target_content_type = models.ForeignKey(ContentType, related_name='notify_target', blank=True, null=True, on_delete=models.CASCADE)
target_object_id = models.CharField(max_length=255, blank=True, null=True)
target = GenericForeignKey('target_content_type', 'target_object_id')
action_object_content_type = models.ForeignKey(ContentType, blank=True, null=True,
related_name='notify_action_object')
related_name='notify_action_object', on_delete=models.CASCADE)
action_object_object_id = models.CharField(max_length=255, blank=True, null=True)
action_object = GenericForeignKey('action_object_content_type', 'action_object_object_id')

21
notifications/templatetags/notifications_tags.py
View file

@ -1,12 +1,16 @@
# -*- coding: utf-8 -*-
from django.core.urlresolvers import reverse
from django import get_version
from distutils.version import StrictVersion
try:
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse
from django.template import Library
from django.utils.html import format_html
register = Library()
@register.assignment_tag(takes_context=True)
def notifications_unread(context):
user = user_context(context)
if not user:
@ -14,6 +18,12 @@ def notifications_unread(context):
return user.notifications.unread().count()
if StrictVersion(get_version()) >= StrictVersion('2.0'):
notifications_unread = register.simple_tag(takes_context=True)(notifications_unread)
else:
notifications_unread = register.assignment_tag(takes_context=True)(notifications_unread)
# Requires vanilla-js framework - http://vanilla-js.com/
@register.simple_tag
def register_notify_callbacks(badge_class='live_notify_badge',
@ -79,6 +89,11 @@ def user_context(context):
request = context['request']
user = request.user
if user.is_anonymous():
try:
user_is_anonymous = user.is_anonymous()
except TypeError: # Django >= 1.11
user_is_anonymous = user.is_anonymous
if user_is_anonymous:
return None
return user

8
notifications/tests/settings.py
View file

@ -12,12 +12,18 @@ DATABASES = {
}
}
# Django < 2.0
MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
)
# Django >= 2.0
MIDDLEWARE = [
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
]
INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.auth',

5
notifications/tests/tests.py
View file

@ -14,7 +14,10 @@ except ImportError:
from django.conf import settings
from django.contrib.auth.models import User, Group
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse
try:
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse
from django.utils.timezone import utc, localtime
from django.utils import timezone
import pytz

9
notifications/tests/urls.py
View file

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
from distutils.version import StrictVersion
from django import get_version
from django.conf.urls import include, url
from django.contrib import admin
from django.contrib.auth.views import login
@ -9,8 +10,12 @@ import notifications.tests.views
urlpatterns = [
url(r'^login/$', login, name='login'), # needed for Django 1.6 tests
url(r'^admin/', include(admin.site.urls)),
url(r'^test_make/', notifications.tests.views.make_notification),
url(r'^test/', notifications.tests.views.live_tester),
url(r'^', include(notifications.urls, namespace='notifications')),
]
if StrictVersion(get_version()) >= StrictVersion('2.0'):
urlpatterns.append(url(r'^admin/', admin.site.urls))
else:
urlpatterns.append(url(r'^admin/', include(admin.site.urls)))

14
notifications/views.py
View file

@ -121,7 +121,12 @@ def delete(request, slug=None):
def live_unread_notification_count(request):
if not request.user.is_authenticated():
try:
user_is_authenticated = request.user.is_authenticated()
except TypeError: # Django >= 1.11
user_is_authenticated = request.user.is_authenticated
if not user_is_authenticated:
data = {'unread_count':0}
else:
data = {
@ -131,7 +136,12 @@ def live_unread_notification_count(request):
def live_unread_notification_list(request):
if not request.user.is_authenticated():
try:
user_is_authenticated = request.user.is_authenticated()
except TypeError: # Django >= 1.11
user_is_authenticated = request.user.is_authenticated
if not user_is_authenticated:
data = {
'unread_count':0,
'unread_list':[]