bugfix/67-reverse-for-profile-update #69

Merged
Fred merged 3 commits from bugfix/67-reverse-for-profile-update into master 2021-06-19 08:27:21 +02:00
3 changed files with 138 additions and 109 deletions
Showing only changes of commit fe964af90a - Show all commits

View File

@ -7,5 +7,5 @@ from . import views
profile_urlpatterns = [
path(r"lookup/", views.user_lookup, name="user_lookup"),
path(r"edit/<int:profileid>/", views.profile_update, name="profile_update"),
path(r"edit/", views.profile_update, name="profile_update"),
]

View File

@ -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)

View File

@ -157,9 +157,10 @@
<b class="caret d-none d-lg-block d-xl-block"></b>
<p class="d-lg-none">Log out</p>
</a>
{% if request.user %}
<ul class="dropdown-menu dropdown-navbar">
<li class="nav-link">
<a href="{% url 'profile_update' request.session.profileid %}" class="nav-item dropdown-item">Profile</a>
<a href="{% url 'profile_update' %}" class="nav-item dropdown-item">Profile</a>
</li>
<!-- <li class="nav-link"> -->
<!-- <a href="javascript:void(0)" class="nav-item dropdown-item">Settings</a> -->
@ -169,6 +170,7 @@
<a href="{% url 'logout' %}" class="nav-item dropdown-item">Log out</a>
</li>
</ul>
{% endif %}
</li>
<li class="separator d-lg-none"></li>
</ul>
@ -301,26 +303,57 @@
$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.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.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);
@ -418,4 +451,5 @@
{% block footerscript %}{% endblock %}
</body>
</html>