diff --git a/photo21/templates/account/email.html b/photo21/templates/account/email.html index ee7a394..19fa9c5 100644 --- a/photo21/templates/account/email.html +++ b/photo21/templates/account/email.html @@ -15,9 +15,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
  • {% trans "E-mail Addresses" %}
    • -
  • - {% trans "Social connections" %} -
    • diff --git a/photo21/templates/base.html b/photo21/templates/base.html index ce771a1..cf80e1b 100644 --- a/photo21/templates/base.html +++ b/photo21/templates/base.html @@ -72,6 +72,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% if request.user.is_authenticated %} + {% if not request.user.socialaccount_set.all %}
  • {% url 'account_email' as url %} @@ -81,6 +82,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "Account" %}
    • + {% endif %}
  • diff --git a/photo21/templates/socialaccount/connections.html b/photo21/templates/socialaccount/connections.html deleted file mode 100644 index 2da36e5..0000000 --- a/photo21/templates/socialaccount/connections.html +++ /dev/null @@ -1,65 +0,0 @@ -{% extends "socialaccount/base.html" %} -{% comment %} -This file is part of photo21 -Copyright (C) 2022 Amicale des élèves de l'ENS Paris-Saclay -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load i18n %} -{% block head_title %}{% trans "Account Connections" %}{% endblock %} - -{% block content %} -

    {% trans "Account" %}

    -
    -
    - -
    -
    - {% if form.accounts %} -

    {% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}

    - -
    - {% csrf_token %} -
    - {% if form.non_field_errors %} -
    {{ form.non_field_errors }}
    - {% endif %} - - {% for base_account in form.accounts %} - {% with base_account.get_provider_account as account %} -
    - -
    - {% endwith %} - {% endfor %} - -
    - -
    -
    -
    - - {% else %} -

    {% trans 'You currently have no social network accounts connected to this account.' %}

    - {% endif %} - -

    {% trans 'Add a 3rd Party Account' %}

    - -
      - {% include "socialaccount/snippets/provider_list.html" with process="connect" %} -
    - - {% include "socialaccount/snippets/login_extra.html" %} -
    -
    -{% endblock %} diff --git a/photo21/urls.py b/photo21/urls.py index 5b4df26..2372446 100644 --- a/photo21/urls.py +++ b/photo21/urls.py @@ -17,12 +17,13 @@ from django.views.i18n import JavaScriptCatalog if settings.DEBUG: from debug_toolbar.toolbar import debug_toolbar_urls -from .views import IndexView, MediaAccess +from .views import EmailView, IndexView, MediaAccess urlpatterns = [ path("select2/", include("django_select2.urls")), path("", IndexView.as_view(), name="index"), path("", include("photologue.urls", namespace="photologue")), + path("accounts/email/", EmailView.as_view(), name="account_email"), path("accounts/", include("allauth.urls")), path("accounts/", include("allauth_oauth.urls")), diff --git a/photo21/views.py b/photo21/views.py index 9f43f67..79e26ce 100644 --- a/photo21/views.py +++ b/photo21/views.py @@ -4,14 +4,23 @@ import os +from allauth.account.views import EmailView as AllauthEmailView from django.conf import settings from django.contrib.auth import get_user_model from django.contrib.auth.mixins import LoginRequiredMixin from django.http import FileResponse, Http404 +from django.shortcuts import redirect from django.views.generic import ListView, View from photologue.models import Gallery, Photo, Video +class EmailView(AllauthEmailView): + def dispatch(self, request, *args, **kwargs): + if request.user.is_authenticated and request.user.socialaccount_set.exists(): + return redirect("index") + return super().dispatch(request, *args, **kwargs) + + class MediaAccess(View): def get(self, request, path): if not request.user.is_authenticated: