From 3618ba6defdd105f4aa82f1d300a512486499ab6 Mon Sep 17 00:00:00 2001 From: Michael Hall Date: Sat, 17 Mar 2018 16:21:38 -0400 Subject: [PATCH] Support both old-style avatar URLs and new-style upload avatar files --- events/models/profiles.py | 6 +++--- get_together/templates/get_together/base.html | 2 +- get_together/templates/get_together/events/show_event.html | 2 +- .../get_together/new_user/setup_1_confirm_profile.html | 2 +- get_together/templates/get_together/teams/show_team.html | 2 +- get_together/templates/get_together/users/edit_profile.html | 2 +- get_together/templates/get_together/users/show_profile.html | 2 +- requirements.txt | 6 ++++++ 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/events/models/profiles.py b/events/models/profiles.py index 993095d..ec66d89 100644 --- a/events/models/profiles.py +++ b/events/models/profiles.py @@ -45,10 +45,10 @@ class UserProfile(models.Model): return "Unknown Profile" def avatar_url(self): - if self.avatar.url.startswith('http'): - return self.avatar.url + if self.avatar.name.startswith('http'): + return self.avatar.name else: - return settings.MEDIA_URL + '/' + self.avatar.url + return self.avatar.url def get_timezone(self): try: diff --git a/get_together/templates/get_together/base.html b/get_together/templates/get_together/base.html index fd9a889..dc3351b 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 e618be4..3b8f223 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 ad1adcc..6ca2d58 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 6b6c8d3..b9f7947 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 6c6f3ba..fef6036 100644 --- a/get_together/templates/get_together/users/edit_profile.html +++ b/get_together/templates/get_together/users/edit_profile.html @@ -4,7 +4,7 @@
    - +

    Profile: {{user}}

    {% csrf_token %} diff --git a/get_together/templates/get_together/users/show_profile.html b/get_together/templates/get_together/users/show_profile.html index 58481cf..25854f3 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/requirements.txt b/requirements.txt index 7dc5a63..274f8cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,13 +5,19 @@ decorator==4.2.1 defusedxml==0.5.0 dj-database-url==0.4.2 Django==2.0 +django-appconf==1.0.2 +django-imagekit==4.0.2 +django-imagekit-cropper==1.16 django-settings-export==1.2.1 djangorestframework==3.7.7 future==0.16.0 geocoder==1.36.0 idna==2.6 Markdown==2.6.11 +model-mommy==1.5.1 oauthlib==2.0.6 +pilkit==2.0 +Pillow==5.0.0 PyJWT==1.5.3 python3-openid==3.1.0 pytz==2017.3