From 6f81a0d5955c9639dc224f298a5a6a6b9c5a9233 Mon Sep 17 00:00:00 2001 From: Fred Date: Wed, 16 Jun 2021 19:27:20 +0200 Subject: [PATCH 1/3] Fix bug https://sources.grimbox.be/Sulley/khana/issues/67 + Simplification de l'URL + Simplification de la vue Fix #67 --- src/profile/urls.py | 2 +- src/profile/views.py | 11 +- src/templates/base.html | 234 +++++++++++++++++++++++----------------- 3 files changed, 138 insertions(+), 109 deletions(-) diff --git a/src/profile/urls.py b/src/profile/urls.py index 7b825c0..2c7bd6b 100644 --- a/src/profile/urls.py +++ b/src/profile/urls.py @@ -7,5 +7,5 @@ from . import views profile_urlpatterns = [ path(r"lookup/", views.user_lookup, name="user_lookup"), - path(r"edit//", views.profile_update, name="profile_update"), + path(r"edit/", views.profile_update, name="profile_update"), ] diff --git a/src/profile/views.py b/src/profile/views.py index e375b3c..8dd71ed 100644 --- a/src/profile/views.py +++ b/src/profile/views.py @@ -60,17 +60,12 @@ def user_lookup(request): @login_required @require_http_methods(["GET", "POST"]) -def profile_update(request, profileid): - """Modification d'un profil utilisateur. +def profile_update(request): + """Modification du profil de l'utilisateur connecté - Args: - profileid (int): L'identifiant du profil utilisateur à modifier. """ - profile = get_object_or_404(Profile, pk=profileid) - - if profile.user != request.user: - raise PermissionDenied("Permission denied : you don't have the permission to update this profile.") + profile = request.user.profile if request.method == "POST": form = ProfileForm(request.POST, instance=profile) diff --git a/src/templates/base.html b/src/templates/base.html index 0b53ca0..f683874 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -87,93 +87,95 @@ -
- -
- Dashboard - - - + Dashboard + + + -
-
+ {% csrf_token %}
@@ -59,10 +59,10 @@
- -{% endblock %} +{% endblock %} \ No newline at end of file -- 2.39.2 From 801477eadd545c7938ef7b0be091e6462d617afb Mon Sep 17 00:00:00 2001 From: Fred Date: Wed, 16 Jun 2021 19:37:34 +0200 Subject: [PATCH 3/3] Revert to master base.html --- src/templates/base.html | 57 ++++++++--------------------------------- 1 file changed, 11 insertions(+), 46 deletions(-) diff --git a/src/templates/base.html b/src/templates/base.html index 0f31ad6..c614494 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -301,57 +301,22 @@ $full_page = $('.full-page'); $sidebar_responsive = $('body > .navbar-collapse'); - { - % - if request.session.is_sidebar_minified % - } - sidebar_mini_active = true; { - % - else % - } - sidebar_mini_active = false; { - % - endif % - } - - - { - % - if request.session.template == 0 % - } - white_color = false; { - % - else % - } - white_color = true; { - % - endif % - } + {% if request.session.is_sidebar_minified %} + sidebar_mini_active = true; {% else %} + sidebar_mini_active = false; {% endif %} + {% if request.session.template == 0 %} + white_color = false; {% else %} + white_color = true; {% endif %} window_width = $(window).width(); fixed_plugin_open = $('.sidebar .sidebar-wrapper .nav li.active a p').html(); - { - % - if request.session.sidebar == 1 % - } - color = "blue"; { - % - elif request.session.sidebar == 2 % - } - color = "green"; { - % - elif request.session.sidebar == 3 % - } - color = "orange"; { - % - elif request.session.sidebar == 4 % - } - color = "red"; { - % - endif % - } + {% if request.session.sidebar == 1 %} + color = "blue"; {% elif request.session.sidebar == 2 %} + color = "green"; {% elif request.session.sidebar == 3 %} + color = "orange"; {% elif request.session.sidebar == 4 %} + color = "red"; {% endif %} $sidebar.attr('data', color); $main_panel.attr('data', color); $full_page.attr('filter-color', color); -- 2.39.2