Commit 285bae72a6253f3248ce86e305b23e92217c7b69
1 parent
375ce49e
Exists in
master
and in
5 other branches
Deleting unsued url, procedure and view for update
Showing
3 changed files
with
2 additions
and
31 deletions
Show diff stats
users/templates/users/profile.html
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | <ul class="nav nav-pills nav-stacked"> | 20 | <ul class="nav nav-pills nav-stacked"> |
| 21 | <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li> | 21 | <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li> |
| 22 | <li><a href="{% url 'users:profile' %}">{% trans 'View Profile' %}</a></li> | 22 | <li><a href="{% url 'users:profile' %}">{% trans 'View Profile' %}</a></li> |
| 23 | - <li><a href="{% url 'users:edit_profile' user.id %}">{% trans 'Edit Profile' %}</a></li> | 23 | + <li><a href="{% url 'users:update_profile' %}">{% trans 'Edit Profile' %}</a></li> |
| 24 | </ul> | 24 | </ul> |
| 25 | </div> | 25 | </div> |
| 26 | </div> | 26 | </div> |
users/urls.py
| @@ -9,7 +9,6 @@ urlpatterns = [ | @@ -9,7 +9,6 @@ urlpatterns = [ | ||
| 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, name='delete'), |
| 11 | url(r'^profile/$', views.Profile.as_view(), name='profile'), | 11 | url(r'^profile/$', views.Profile.as_view(), name='profile'), |
| 12 | - url(r'^profile/editar/(?P<username>[\w_-]+)/$', views.EditProfile.as_view(), name='edit_profile'), | ||
| 13 | # | 12 | # |
| 14 | url(r'^profile/update/$', views.UpdateProfile.as_view(), name='update_profile'), | 13 | url(r'^profile/update/$', views.UpdateProfile.as_view(), name='update_profile'), |
| 15 | url(r'^profile/delete/$', views.DeleteUser.as_view(), name='delete_profile'), | 14 | url(r'^profile/delete/$', views.DeleteUser.as_view(), name='delete_profile'), |
users/views.py
| @@ -142,32 +142,4 @@ class Profile(LoginRequiredMixin, generic.DetailView): | @@ -142,32 +142,4 @@ class Profile(LoginRequiredMixin, generic.DetailView): | ||
| 142 | 142 | ||
| 143 | def get_object(self): | 143 | def get_object(self): |
| 144 | user = get_object_or_404(User, username = self.request.user.username) | 144 | user = get_object_or_404(User, username = self.request.user.username) |
| 145 | - return user | ||
| 146 | - | ||
| 147 | -class EditProfile(LoginRequiredMixin, generic.UpdateView): | ||
| 148 | - | ||
| 149 | - login_url = reverse_lazy('core:home') | ||
| 150 | - redirect_field_name = 'next' | ||
| 151 | - template_name = 'users/edit_profile.html' | ||
| 152 | - form_class = UserForm | ||
| 153 | - success_url = reverse_lazy('app:users:edit_profile') | ||
| 154 | - | ||
| 155 | - def get_object(self): | ||
| 156 | - user = get_object_or_404(User, username = self.request.user.username) | ||
| 157 | - return user | ||
| 158 | - | ||
| 159 | - def form_valid(self, form): | ||
| 160 | - self.object = form.save(commit = False) | ||
| 161 | - | ||
| 162 | - if self.object.type_profile == 2: | ||
| 163 | - assign_role(self.object, 'student') | ||
| 164 | - elif self.object.type_profile == 1: | ||
| 165 | - assign_role(self.object, 'professor') | ||
| 166 | - elif self.object.is_staff: | ||
| 167 | - assign_role(self.object, 'system_admin') | ||
| 168 | - | ||
| 169 | - self.object.save() | ||
| 170 | - | ||
| 171 | - messages.success(self.request, _('Profile edited successfully!')) | ||
| 172 | - | ||
| 173 | - return super(EditProfile, self).form_valid(form) | ||
| 174 | \ No newline at end of file | 145 | \ No newline at end of file |
| 146 | + return user | ||
| 175 | \ No newline at end of file | 147 | \ No newline at end of file |