Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios_notifications/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

VERSION = '0.2'
VERSION = '0.2.1'
10 changes: 3 additions & 7 deletions ios_notifications/admin.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# -*- coding: utf-8 -*-

try:
from django.conf.urls import patterns, url
except ImportError: # deprecated since Django 1.4
from django.conf.urls.defaults import patterns, url
from django.conf.urls import url

from django.contrib import admin
from django.template.response import TemplateResponse
Expand Down Expand Up @@ -34,9 +31,8 @@ class NotificationAdmin(admin.ModelAdmin):

def get_urls(self):
urls = super(NotificationAdmin, self).get_urls()
notification_urls = patterns('',
url(r'^(?P<id>\d+)/push-notification/$', self.admin_site.admin_view(self.admin_push_notification),
name='admin_push_notification'),)
notification_urls = [url(r'^(?P<id>\d+)/push-notification/$', self.admin_site.admin_view(self.admin_push_notification),
name='admin_push_notification')]
return notification_urls + urls

def admin_push_notification(self, request, **kwargs):
Expand Down
10 changes: 3 additions & 7 deletions ios_notifications/urls.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# -*- coding: utf-8 -*-

try:
from django.conf.urls import patterns, url
except ImportError: # deprecated since Django 1.4
from django.conf.urls.defaults import patterns, url

from django.conf.urls import url
from .api import routes

urlpatterns = patterns('',
urlpatterns = [
url(r'^device/$', routes.device, name='ios-notifications-device-create'),
url(r'^device/(?P<token>\w+)/(?P<service__id>\d+)/$', routes.device, name='ios-notifications-device'),
)
]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
'Topic :: Software Development :: Libraries :: Application Frameworks',
],
install_requires=[
'Django>=1.3',
'Django>=1.8',
'pyOpenSSL>=0.10',
'django-fields>=0.2.2'
],
Expand Down