mirror of
https://github.com/Hopiu/django-notifications.git
synced 2026-04-14 18:30:58 +00:00
PEP8 Fixes
This commit is contained in:
parent
3a391c6d1b
commit
25e15e412b
1 changed files with 27 additions and 19 deletions
|
|
@ -1,16 +1,14 @@
|
|||
# Create your views here.
|
||||
from django import get_version
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||
from django.forms import model_to_dict
|
||||
from django.shortcuts import get_object_or_404, render, redirect
|
||||
from django.template.context import RequestContext
|
||||
from django.shortcuts import get_object_or_404, redirect
|
||||
from django.utils.decorators import method_decorator
|
||||
from django.views.generic import ListView
|
||||
|
||||
from .utils import slug2id
|
||||
from .models import Notification
|
||||
|
||||
from django import get_version
|
||||
from distutils.version import StrictVersion
|
||||
if StrictVersion(get_version()) >= StrictVersion('1.7.0'):
|
||||
from django.http import JsonResponse
|
||||
|
|
@ -18,11 +16,14 @@ else:
|
|||
# Django 1.6 doesn't have a proper JsonResponse
|
||||
import json
|
||||
from django.http import HttpResponse
|
||||
|
||||
def date_handler(obj):
|
||||
return obj.isoformat() if hasattr(obj, 'isoformat') else obj
|
||||
|
||||
|
||||
def JsonResponse(data):
|
||||
return HttpResponse(json.dumps(data, default=date_handler), content_type="application/json")
|
||||
return HttpResponse(
|
||||
json.dumps(data, default=date_handler),
|
||||
content_type="application/json")
|
||||
|
||||
|
||||
class NotificationViewList(ListView):
|
||||
|
|
@ -64,11 +65,13 @@ def mark_all_as_read(request):
|
|||
return redirect(_next)
|
||||
return redirect('notifications:all')
|
||||
|
||||
|
||||
@login_required
|
||||
def mark_as_read(request, slug=None):
|
||||
id = slug2id(slug)
|
||||
|
||||
notification = get_object_or_404(Notification, recipient=request.user, id=id)
|
||||
notification = get_object_or_404(
|
||||
Notification, recipient=request.user, id=id)
|
||||
notification.mark_as_read()
|
||||
|
||||
_next = request.GET.get('next')
|
||||
|
|
@ -78,11 +81,13 @@ def mark_as_read(request, slug=None):
|
|||
|
||||
return redirect('notifications:all')
|
||||
|
||||
|
||||
@login_required
|
||||
def mark_as_unread(request, slug=None):
|
||||
id = slug2id(slug)
|
||||
|
||||
notification = get_object_or_404(Notification, recipient=request.user, id=id)
|
||||
notification = get_object_or_404(
|
||||
Notification, recipient=request.user, id=id)
|
||||
notification.mark_as_unread()
|
||||
|
||||
_next = request.GET.get('next')
|
||||
|
|
@ -97,7 +102,9 @@ def mark_as_unread(request, slug=None):
|
|||
def delete(request, slug=None):
|
||||
_id = slug2id(slug)
|
||||
|
||||
notification = get_object_or_404(Notification, recipient=request.user, id=_id)
|
||||
notification = get_object_or_404(
|
||||
Notification, recipient=request.user, id=_id)
|
||||
|
||||
if getattr(settings, 'NOTIFICATIONS_SOFT_DELETE', False):
|
||||
notification.deleted = True
|
||||
notification.save()
|
||||
|
|
@ -111,26 +118,27 @@ def delete(request, slug=None):
|
|||
|
||||
return redirect('notifications:all')
|
||||
|
||||
|
||||
def live_unread_notification_count(request):
|
||||
from random import randint
|
||||
data = {
|
||||
'unread_count':request.user.notifications.unread().count(),
|
||||
'unread_count': request.user.notifications.unread().count(),
|
||||
}
|
||||
return JsonResponse(data)
|
||||
|
||||
|
||||
def live_unread_notification_list(request):
|
||||
|
||||
|
||||
try:
|
||||
num_to_fetch = request.GET.get('max',5) #If they don't specify, make it 5.
|
||||
num_to_fetch = request.GET.get('max', 5) # If they don't specify, make it 5.
|
||||
num_to_fetch = int(num_to_fetch)
|
||||
num_to_fetch = max(1,num_to_fetch) # if num_to_fetch is negative, force at least one fetched notifications
|
||||
num_to_fetch = min(num_to_fetch,100) # put a sane ceiling on the number retrievable
|
||||
num_to_fetch = max(1, num_to_fetch) # if num_to_fetch is negative, force at least one fetched notifications
|
||||
num_to_fetch = min(num_to_fetch, 100) # put a sane ceiling on the number retrievable
|
||||
except ValueError:
|
||||
num_to_fetch = 5 # If casting to an int fails, just make it 5.
|
||||
num_to_fetch = 5 # If casting to an int fails, just make it 5.
|
||||
|
||||
data = {
|
||||
'unread_count':request.user.notifications.unread().count(),
|
||||
'unread_list':[model_to_dict(n) for n in request.user.notifications.unread()[0:num_to_fetch]]
|
||||
'unread_count': request.user.notifications.unread().count(),
|
||||
'unread_list': [model_to_dict(n) for n in request.user.notifications.unread()[0:num_to_fetch]]
|
||||
}
|
||||
return JsonResponse(data)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue