diff --git a/users/templates/list_users.html b/users/templates/list_users.html index b769f6c..285627d 100644 --- a/users/templates/list_users.html +++ b/users/templates/list_users.html @@ -62,7 +62,7 @@ {% if acc.gender == 'M' %} Avatar {% else %} - Avatar + Avatar {% endif %} {% endif %} @@ -76,7 +76,7 @@ {% trans 'Delete' %} - + diff --git a/users/templates/users/profile.html b/users/templates/users/profile.html index d530468..715ff98 100644 --- a/users/templates/users/profile.html +++ b/users/templates/users/profile.html @@ -43,7 +43,7 @@
- + {% if user.image %}
{% else %} @@ -51,7 +51,7 @@ {% if user.gender == 'M' %} Avatar {% else %} - Avatar + Avatar {% endif %} {% endif %}
@@ -65,7 +65,7 @@ {% else %} {% trans "OffLine" %} {% endif %} - + {% trans "Name" %}: @@ -94,7 +94,7 @@ {% else %} {% trans "Student" %} {% endif %} - + {% trans "CPF" %}: @@ -104,7 +104,7 @@ {% else %} {% trans "doesn't possess CPF" %} {% endif %} - + {% trans "Phone Number" %}: @@ -113,7 +113,7 @@ {% else %} {% trans "doesn't possess Phone" %} {% endif %} - + {% trans "Gender" %}: diff --git a/users/templates/users/remove_account.html b/users/templates/users/remove_account.html index 8ee7557..4983b0f 100644 --- a/users/templates/users/remove_account.html +++ b/users/templates/users/remove_account.html @@ -29,7 +29,7 @@

{% trans 'All data will be lost and havent how recover it.' %}

{% trans 'Cancel' %} diff --git a/users/urls.py b/users/urls.py index 6a62f86..25b912e 100644 --- a/users/urls.py +++ b/users/urls.py @@ -7,7 +7,8 @@ urlpatterns = [ url(r'^create/$', views.Create.as_view(), name='create'), url(r'^edit/(?P[\w_-]+)/$', views.Update.as_view(), name='update'), url(r'^view/(?P[\w_-]+)/$', views.View.as_view(), name='view'), - url(r'^delete/(?P[\w_-]+)/$', views.delete, name='delete'), + url(r'^delete/(?P[\w_-]+)/$', views.delete_user, name='delete'), + url(r'^remove/(?P[\w_-]+)/$', views.remove_account, name='remove'), url(r'^profile/$', views.Profile.as_view(), name='profile'), url(r'^search/$', views.SearchView.as_view(), name='search'), # @@ -15,5 +16,5 @@ urlpatterns = [ url(r'^profile/change_password/$', views.Change_password.as_view(), name='change_password'), url(r'^profile/remove_account/$', views.Remove_account.as_view(), name='remove_account'), url(r'^profile/delete/$', views.DeleteUser.as_view(), name='delete_profile'), - + ] diff --git a/users/views.py b/users/views.py index 9ac476c..d739a57 100644 --- a/users/views.py +++ b/users/views.py @@ -106,12 +106,17 @@ class View(LoginRequiredMixin, generic.DetailView): slug_field = 'username' slug_url_kwarg = 'username' -def delete(request,username): +def delete_user(request,username): user = get_object_or_404(User,username = username) user.delete() messages.success(request,_("User deleted Successfully!")) return redirect('users:manage') +def remove_account(request,username): + user = get_object_or_404(User,username = username) + user.delete() + messages.success(request,_("User deleted Successfully!")) + return redirect('core:logout') class Change_password(generic.TemplateView): template_name = 'users/change_password.html' -- libgit2 0.21.2