Download as
Browse Code »

Commit 0c99ae7fe92d8f909e2fde14329c5f3347eb3471

Authored by juliotoscano
1 parent 32f94d68
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

work remove account #227

Showing 5 changed files with 20 additions and 14 deletions   Show diff stats
users/templates/list_users.html
  Diff comments   View file @0c99ae7
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 {% if acc.gender == 'M' %} 62 {% if acc.gender == 'M' %}
63 <img src="{% static 'img/male_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user"> 63 <img src="{% static 'img/male_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user">
64 {% else %} 64 {% else %}
65 - <img src="{% static 'img/female_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user"> 65 + <img src="{% static 'img/female_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user">
66 {% endif %} 66 {% endif %}
67 {% endif %} 67 {% endif %}
68 </div> 68 </div>
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <a href="javascript:void(0)" class="btn btn-danger btn-raised btn-lg" data-toggle="modal" data-target="#DeleteModal{{ forloop.counter }}">{% trans 'Delete' %}</a> 76 <a href="javascript:void(0)" class="btn btn-danger btn-raised btn-lg" data-toggle="modal" data-target="#DeleteModal{{ forloop.counter }}">{% trans 'Delete' %}</a>
77 </div> 77 </div>
78 </div> 78 </div>
79 - 79 +
80 80
81 <!-- Modal --> 81 <!-- Modal -->
82 <div class="modal fade" id="DeleteModal{{ forloop.counter }}" tabindex="-1" role="dialog" aria-labelledby="DeleteModalLabel"> 82 <div class="modal fade" id="DeleteModal{{ forloop.counter }}" tabindex="-1" role="dialog" aria-labelledby="DeleteModalLabel">
@@ -87,10 +87,10 @@ @@ -87,10 +87,10 @@
87 <h4 class="modal-title" id="DeleteModalLabel">{% trans 'Confirm delete' %}</h4> 87 <h4 class="modal-title" id="DeleteModalLabel">{% trans 'Confirm delete' %}</h4>
88 </div> 88 </div>
89 <div class="modal-body"> 89 <div class="modal-body">
90 - {% trans 'Are you sure you want to delete the user' %} <b>{{acc.name}}</b>? 90 + {% trans 'Are you sure you want to delete the user' %} <b>{{acc.name}}</b>?
91 </div> 91 </div>
92 <div class="modal-footer"> 92 <div class="modal-footer">
93 - <a href="#" class="btn btn-raised btn-danger" data-dismiss="modal">{% trans 'Cancel' %}</a> 93 + <a href="#" class="btn btn-raised btn-danger" data-dismiss="modal">{% trans 'Cancel' %}</a>
94 <a href="{% url 'users:delete' acc.username %}" class="btn btn-raised btn-success" style="margin-top: 0">{% trans 'Delete' %}</a> 94 <a href="{% url 'users:delete' acc.username %}" class="btn btn-raised btn-success" style="margin-top: 0">{% trans 'Delete' %}</a>
95 </div> 95 </div>
96 </div> 96 </div>
users/templates/users/profile.html
  Diff comments   View file @0c99ae7
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <div class="col-lg-12"> 43 <div class="col-lg-12">
44 <div class="well well-lg"> 44 <div class="well well-lg">
45 <div class="row"> 45 <div class="row">
46 - 46 +
47 {% if user.image %} 47 {% if user.image %}
48 <div class="col-md-4" style="width: 200px;overflow:hidden;margin-left: 8em;height: 150px;background-image: url('{{user.image.url}}');background-position: center;background-size: cover;"> 48 <div class="col-md-4" style="width: 200px;overflow:hidden;margin-left: 8em;height: 150px;background-image: url('{{user.image.url}}');background-position: center;background-size: cover;">
49 {% else %} 49 {% else %}
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 {% if user.gender == 'M' %} 51 {% if user.gender == 'M' %}
52 <img src="{% static 'img/male_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;"> 52 <img src="{% static 'img/male_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;">
53 {% else %} 53 {% else %}
54 - <img src="{% static 'img/female_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;"> 54 + <img src="{% static 'img/female_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;">
55 {% endif %} 55 {% endif %}
56 {% endif %} 56 {% endif %}
57 </div> 57 </div>
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 {% else %} 65 {% else %}
66 <td> {% trans "OffLine" %}</td> 66 <td> {% trans "OffLine" %}</td>
67 {% endif %} 67 {% endif %}
68 - 68 +
69 </tr> 69 </tr>
70 <tr> 70 <tr>
71 <td>{% trans "Name" %}:</td> 71 <td>{% trans "Name" %}:</td>
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 {% else %} 94 {% else %}
95 <td>{% trans "Student" %}</td> 95 <td>{% trans "Student" %}</td>
96 {% endif %} 96 {% endif %}
97 - 97 +
98 </tr> 98 </tr>
99 <tr> 99 <tr>
100 <td>{% trans "CPF" %}:</td> 100 <td>{% trans "CPF" %}:</td>
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
104 {% else %} 104 {% else %}
105 <td>{% trans "doesn't possess CPF" %}</td> 105 <td>{% trans "doesn't possess CPF" %}</td>
106 {% endif %} 106 {% endif %}
107 - 107 +
108 </tr> 108 </tr>
109 <tr> 109 <tr>
110 <td>{% trans "Phone Number" %}:</td> 110 <td>{% trans "Phone Number" %}:</td>
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 {% else %} 113 {% else %}
114 <td>{% trans "doesn't possess Phone" %}</td> 114 <td>{% trans "doesn't possess Phone" %}</td>
115 {% endif %} 115 {% endif %}
116 - 116 +
117 </tr> 117 </tr>
118 <tr> 118 <tr>
119 <td>{% trans "Gender" %}:</td> 119 <td>{% trans "Gender" %}:</td>
users/templates/users/remove_account.html
  Diff comments   View file @0c99ae7
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <p>{% trans 'All data will be lost and havent how recover it.' %}</p> 29 <p>{% trans 'All data will be lost and havent how recover it.' %}</p>
30 <div class="row"> 30 <div class="row">
31 <div class="col-md-3 col-sm-2 col-xs-2"> 31 <div class="col-md-3 col-sm-2 col-xs-2">
32 - <a href="#" class="btn btn-raised btn-block btn-success" >{% trans 'Remove' %}</a> 32 + <a href="{% url 'users:remove' user.username %}" class="btn btn-raised btn-block btn-success" >{% trans 'Remove' %}</a>
33 </div> 33 </div>
34 <div class="col-md-3 col-sm-2 col-xs-2"> 34 <div class="col-md-3 col-sm-2 col-xs-2">
35 <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-danger" >{% trans 'Cancel' %}</a> 35 <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-danger" >{% trans 'Cancel' %}</a>
@@ -7,7 +7,8 @@ urlpatterns = [ @@ -7,7 +7,8 @@ urlpatterns = [
7 url(r'^create/$', views.Create.as_view(), name='create'), 7 url(r'^create/$', views.Create.as_view(), name='create'),
8 url(r'^edit/(?P<username>[\w_-]+)/$', views.Update.as_view(), name='update'), 8 url(r'^edit/(?P<username>[\w_-]+)/$', views.Update.as_view(), name='update'),
9 url(r'^view/(?P<username>[\w_-]+)/$', views.View.as_view(), name='view'), 9 url(r'^view/(?P<username>[\w_-]+)/$', views.View.as_view(), name='view'),
10 - url(r'^delete/(?P<username>[\w_-]+)/$', views.delete, name='delete'), 10 + url(r'^delete/(?P<username>[\w_-]+)/$', views.delete_user, name='delete'),
  11 + url(r'^remove/(?P<username>[\w_-]+)/$', views.remove_account, name='remove'),
11 url(r'^profile/$', views.Profile.as_view(), name='profile'), 12 url(r'^profile/$', views.Profile.as_view(), name='profile'),
12 url(r'^search/$', views.SearchView.as_view(), name='search'), 13 url(r'^search/$', views.SearchView.as_view(), name='search'),
13 # 14 #
@@ -15,5 +16,5 @@ urlpatterns = [ @@ -15,5 +16,5 @@ urlpatterns = [
15 url(r'^profile/change_password/$', views.Change_password.as_view(), name='change_password'), 16 url(r'^profile/change_password/$', views.Change_password.as_view(), name='change_password'),
16 url(r'^profile/remove_account/$', views.Remove_account.as_view(), name='remove_account'), 17 url(r'^profile/remove_account/$', views.Remove_account.as_view(), name='remove_account'),
17 url(r'^profile/delete/$', views.DeleteUser.as_view(), name='delete_profile'), 18 url(r'^profile/delete/$', views.DeleteUser.as_view(), name='delete_profile'),
18 - 19 +
19 ] 20 ]
users/views.py
  Diff comments   View file @0c99ae7
@@ -106,12 +106,17 @@ class View(LoginRequiredMixin, generic.DetailView): @@ -106,12 +106,17 @@ class View(LoginRequiredMixin, generic.DetailView):
106 slug_field = 'username' 106 slug_field = 'username'
107 slug_url_kwarg = 'username' 107 slug_url_kwarg = 'username'
108 108
109 -def delete(request,username): 109 +def delete_user(request,username):
110 user = get_object_or_404(User,username = username) 110 user = get_object_or_404(User,username = username)
111 user.delete() 111 user.delete()
112 messages.success(request,_("User deleted Successfully!")) 112 messages.success(request,_("User deleted Successfully!"))
113 return redirect('users:manage') 113 return redirect('users:manage')
114 114
  115 +def remove_account(request,username):
  116 + user = get_object_or_404(User,username = username)
  117 + user.delete()
  118 + messages.success(request,_("User deleted Successfully!"))
  119 + return redirect('core:logout')
115 120
116 class Change_password(generic.TemplateView): 121 class Change_password(generic.TemplateView):
117 template_name = 'users/change_password.html' 122 template_name = 'users/change_password.html'