diff --git a/events/models/profiles.py b/events/models/profiles.py index dee5a85..993095d 100644 --- a/events/models/profiles.py +++ b/events/models/profiles.py @@ -2,6 +2,10 @@ from django.db import models from django.contrib.sites.models import Site from django.contrib.auth.models import User, Group, AnonymousUser from django.utils.translation import ugettext_lazy as _ +from django.conf import settings + +from imagekit.models import ProcessedImageField +from imagekit.processors import ResizeToFill from .locale import * @@ -15,7 +19,10 @@ class UserProfile(models.Model): user = models.OneToOneField(User, on_delete=models.CASCADE) realname = models.CharField(verbose_name=_("Real Name"), max_length=150, blank=True) tz = models.CharField(max_length=32, verbose_name=_('Timezone'), default='UTC', choices=[(tz, tz) for tz in pytz.all_timezones], blank=False, null=False) - avatar = models.URLField(verbose_name=_("Photo Image"), max_length=150, blank=True, null=True) + avatar = ProcessedImageField(verbose_name=_("Photo Image"), + upload_to='avatars', + processors=[ResizeToFill(128, 128)], + format='PNG') web_url = models.URLField(verbose_name=_('Website URL'), blank=True, null=True) twitter = models.CharField(verbose_name=_('Twitter Name'), max_length=32, blank=True, null=True) @@ -37,6 +44,12 @@ class UserProfile(models.Model): except: return "Unknown Profile" + def avatar_url(self): + if self.avatar.url.startswith('http'): + return self.avatar.url + else: + return settings.MEDIA_URL + '/' + self.avatar.url + def get_timezone(self): try: return pytz.timezone(self.tz) diff --git a/get_together/settings.py b/get_together/settings.py index 232f771..8d6f090 100644 --- a/get_together/settings.py +++ b/get_together/settings.py @@ -43,6 +43,8 @@ INSTALLED_APPS = [ 'django.contrib.sites', 'rest_framework', 'social_django', + 'imagekit', + 'imagekit_cropper', 'get_together', 'events', @@ -180,3 +182,5 @@ try: except: print("WARNING: You should create a local_settings.py to store local and secret data.") +MEDIA_ROOT = './media/' +MEDIA_URL = '/media/' diff --git a/get_together/templates/get_together/base.html b/get_together/templates/get_together/base.html index 6dae17c..fd9a889 100644 --- a/get_together/templates/get_together/base.html +++ b/get_together/templates/get_together/base.html @@ -72,7 +72,7 @@ form { {% if request.user.is_authenticated %}
  • Profile diff --git a/get_together/templates/get_together/events/show_event.html b/get_together/templates/get_together/events/show_event.html index 68fdcb7..e618be4 100644 --- a/get_together/templates/get_together/events/show_event.html +++ b/get_together/templates/get_together/events/show_event.html @@ -72,7 +72,7 @@ {% for attendee in attendee_list %}
    - + {% for badge in attendee.user.user.account.badges.all %}{% endfor %}
    diff --git a/get_together/templates/get_together/new_user/setup_1_confirm_profile.html b/get_together/templates/get_together/new_user/setup_1_confirm_profile.html index edade4a..ad1adcc 100644 --- a/get_together/templates/get_together/new_user/setup_1_confirm_profile.html +++ b/get_together/templates/get_together/new_user/setup_1_confirm_profile.html @@ -5,7 +5,7 @@
    -

    +

    Please confirm your profile information

    diff --git a/get_together/templates/get_together/teams/show_team.html b/get_together/templates/get_together/teams/show_team.html index 9897f02..6b6c8d3 100644 --- a/get_together/templates/get_together/teams/show_team.html +++ b/get_together/templates/get_together/teams/show_team.html @@ -58,7 +58,7 @@ {% for member in member_list %}
    - + {% for badge in member.user.user.account.badges.all %}{% endfor %}
    {{member.user}}
    diff --git a/get_together/templates/get_together/users/edit_profile.html b/get_together/templates/get_together/users/edit_profile.html index f02ed25..6c6f3ba 100644 --- a/get_together/templates/get_together/users/edit_profile.html +++ b/get_together/templates/get_together/users/edit_profile.html @@ -4,9 +4,9 @@
    - +

    Profile: {{user}}

    - + {% csrf_token %} {% include "events/profile_form.html" %}
    diff --git a/get_together/templates/get_together/users/show_profile.html b/get_together/templates/get_together/users/show_profile.html index e3dfd8c..58481cf 100644 --- a/get_together/templates/get_together/users/show_profile.html +++ b/get_together/templates/get_together/users/show_profile.html @@ -8,7 +8,7 @@
    - {{user.user}} + {{user.user}} {% if user.user.id == request.user.id %} Edit Profile {% endif %} diff --git a/get_together/urls.py b/get_together/urls.py index 21b0b88..ce5d3b6 100644 --- a/get_together/urls.py +++ b/get_together/urls.py @@ -72,3 +72,4 @@ urlpatterns = [ ] if settings.DEBUG: urlpatterns = urlpatterns + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + urlpatterns = urlpatterns + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/get_together/views/user.py b/get_together/views/user.py index 09612fb..7d5662b 100644 --- a/get_together/views/user.py +++ b/get_together/views/user.py @@ -71,7 +71,7 @@ def edit_profile(request): elif request.method == 'POST': old_email = request.user.email user_form = UserForm(request.POST, instance=user) - profile_form = UserProfileForm(request.POST, instance=profile) + profile_form = UserProfileForm(request.POST, request.FILES, instance=profile) if user_form.is_valid() and profile_form.is_valid(): user = user_form.save() profile = profile_form.save()