mirror of
https://github.com/jazzband/django-avatar.git
synced 2026-05-04 13:44:45 +00:00
A couple of minor cosmetic fixes.
This commit is contained in:
Jannis Leidel
parent
aac26b8c70
commit
642eb4937b
2 changed files with 21 additions and 21 deletions
|
|
@ -8,7 +8,6 @@ from django.views.decorators.csrf import csrf_exempt
|
|||
from django.contrib import messages
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib import messages
|
||||
|
||||
from avatar.forms import PrimaryAvatarForm, DeleteAvatarForm, UploadAvatarForm
|
||||
from avatar.models import Avatar
|
||||
|
|
@ -19,7 +18,7 @@ from avatar.util import get_primary_avatar, get_default_avatar_url
|
|||
|
||||
def _get_next(request):
|
||||
"""
|
||||
The part that's the least straightforward about views in this module is how they
|
||||
The part that's the least straightforward about views in this module is how they
|
||||
determine their redirects after they have finished computation.
|
||||
|
||||
In short, they will try and determine the next place to go in the following order:
|
||||
|
|
@ -41,14 +40,14 @@ def _get_next(request):
|
|||
def _get_avatars(user):
|
||||
# Default set. Needs to be sliced, but that's it. Keep the natural order.
|
||||
avatars = user.avatar_set.all()
|
||||
|
||||
|
||||
# Current avatar
|
||||
primary_avatar = avatars.order_by('-primary')[:1]
|
||||
if primary_avatar:
|
||||
avatar = primary_avatar[0]
|
||||
else:
|
||||
avatar = None
|
||||
|
||||
|
||||
if AVATAR_MAX_AVATARS_PER_USER == 1:
|
||||
avatars = primary_avatar
|
||||
else:
|
||||
|
|
@ -69,8 +68,8 @@ def webcam_upload(request, id):
|
|||
avatar.save()
|
||||
messages.success(request, _("Successfully uploaded a new avatar."))
|
||||
return HttpResponse(status=200, content="ok")
|
||||
|
||||
|
||||
|
||||
|
||||
@login_required
|
||||
def add(request, extra_context=None, next_override=None,
|
||||
upload_form=UploadAvatarForm, *args, **kwargs):
|
||||
|
|
@ -93,8 +92,8 @@ def add(request, extra_context=None, next_override=None,
|
|||
extra_context,
|
||||
context_instance = RequestContext(
|
||||
request,
|
||||
{ 'avatar': avatar,
|
||||
'avatars': avatars,
|
||||
{ 'avatar': avatar,
|
||||
'avatars': avatars,
|
||||
'upload_avatar_form': upload_avatar_form,
|
||||
'next': next_override or _get_next(request), }
|
||||
)
|
||||
|
|
@ -131,7 +130,7 @@ def change(request, extra_context=None, next_override=None,
|
|||
extra_context,
|
||||
context_instance = RequestContext(
|
||||
request,
|
||||
{ 'avatar': avatar,
|
||||
{ 'avatar': avatar,
|
||||
'avatars': avatars,
|
||||
'upload_avatar_form': upload_avatar_form,
|
||||
'primary_avatar_form': primary_avatar_form,
|
||||
|
|
@ -165,22 +164,22 @@ def delete(request, extra_context=None, next_override=None, *args, **kwargs):
|
|||
extra_context,
|
||||
context_instance = RequestContext(
|
||||
request,
|
||||
{ 'avatar': avatar,
|
||||
{ 'avatar': avatar,
|
||||
'avatars': avatars,
|
||||
'delete_avatar_form': delete_avatar_form,
|
||||
'next': next_override or _get_next(request), }
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
def avatar_gallery(request, username, template_name="avatar/gallery.html"):
|
||||
user = get_object_or_404(User, username=username)
|
||||
return render_to_response(template_name, {
|
||||
"other_user": user,
|
||||
"avatars": user.avatar_set.all(),
|
||||
}, context_instance=RequestContext(request))
|
||||
|
||||
|
||||
|
||||
|
||||
def avatar(request, username, id, template_name="avatar/avatar.html"):
|
||||
user = get_object_or_404(User, username=username)
|
||||
avatars = user.avatar_set.order_by("-date_uploaded")
|
||||
|
|
@ -190,11 +189,11 @@ def avatar(request, username, id, template_name="avatar/avatar.html"):
|
|||
avatar = avatars.get(pk=id)
|
||||
if not avatar:
|
||||
return Http404
|
||||
|
||||
|
||||
index = avatars.filter(date_uploaded__gt=avatar.date_uploaded).count()
|
||||
count = avatars.count()
|
||||
|
||||
if index==0:
|
||||
|
||||
if index == 0:
|
||||
prev = avatars.reverse()[0]
|
||||
if count <= 1:
|
||||
next = avatars[0]
|
||||
|
|
@ -202,7 +201,7 @@ def avatar(request, username, id, template_name="avatar/avatar.html"):
|
|||
next = avatars[1]
|
||||
else:
|
||||
prev = avatars[index-1]
|
||||
|
||||
|
||||
if (index+1)>=count:
|
||||
next = avatars[0]
|
||||
prev_index = index-1
|
||||
|
|
@ -211,8 +210,7 @@ def avatar(request, username, id, template_name="avatar/avatar.html"):
|
|||
prev = avatars[prev_index]
|
||||
else:
|
||||
next = avatars[index+1]
|
||||
|
||||
|
||||
|
||||
return render_to_response(template_name, {
|
||||
"other_user": user,
|
||||
"avatar": avatar,
|
||||
|
|
|
|||
4
setup.py
4
setup.py
|
|
@ -160,7 +160,9 @@ setup(
|
|||
keywords='avatar,django',
|
||||
author='Eric Florenzano',
|
||||
author_email='floguy@gmail.com',
|
||||
url='http://github.com/ericflo/django-avatar/',
|
||||
maintainer='Jannis Leidel',
|
||||
maintainer_email='jannis@leidel.info',
|
||||
url='http://github.com/jezdez/django-avatar/',
|
||||
license='BSD',
|
||||
packages=find_packages(),
|
||||
package_data={
|
||||
|
|
|
|||
Loading…
Reference in a new issue