-
-
-
-
{% endblock %}
diff --git a/users/templates/users/create.html b/users/templates/users/create.html
index 4d40956..92dae0c 100644
--- a/users/templates/users/create.html
+++ b/users/templates/users/create.html
@@ -11,7 +11,7 @@
- {% include 'users/_form.html' %}
+ {% include 'users/_form.html' with back_url="users:manage" %}
diff --git a/users/templates/users/edit_profile.html b/users/templates/users/edit_profile.html
index 9a58bee..2f1dffb 100644
--- a/users/templates/users/edit_profile.html
+++ b/users/templates/users/edit_profile.html
@@ -12,62 +12,13 @@
{% block content %}
- {% if messages %}
- {% for message in messages %}
-
-
-
{{ message }}
-
- {% endfor %}
- {% endif %}
-
+
+
+
+ {% include "users/_form.html" with back_url="users:profile" %}
+
+
+
+
+
{% endblock %}
diff --git a/users/templates/users/update.html b/users/templates/users/update.html
index 13ef811..11deb91 100644
--- a/users/templates/users/update.html
+++ b/users/templates/users/update.html
@@ -14,21 +14,10 @@
{% block content %}
- {% if messages %}
- {% for message in messages %}
-
-
-
{{ message }}
-
- {% endfor %}
- {% endif %}
-
- {% include 'users/_form.html' %}
+ {% include 'users/_form.html' with back_url="users:manage" %}
diff --git a/users/urls.py b/users/urls.py
index 4806990..1e8e3e6 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -12,4 +12,5 @@ urlpatterns = [
url(r'^create/$', views.CreateView.as_view(), name = 'create'),
url(r'^profile/$', views.Profile.as_view(), name = 'profile'),
url(r'^edit_profile/$', views.UpdateProfile.as_view(), name = 'edit_profile'),
+ url(r'^change_pass/$', views.ChangePassView.as_view(), name='change_pass'),
]
diff --git a/users/views.py b/users/views.py
index aff575c..3288bc8 100644
--- a/users/views.py
+++ b/users/views.py
@@ -14,7 +14,7 @@ from itertools import chain
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from .models import User
-from .forms import RegisterUserForm, ProfileForm, UserForm
+from .forms import RegisterUserForm, ProfileForm, UserForm, ChangePassForm
#API IMPORTS
from rest_framework import viewsets
@@ -179,6 +179,44 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
return context
+class ChangePassView(LoginRequiredMixin, generic.UpdateView):
+ login_url = reverse_lazy("users:login")
+ redirect_field_name = 'next'
+
+ template_name = 'users/change_password.html'
+ slug_field = 'email'
+ slug_url_kwarg = 'email'
+ context_object_name = 'acc'
+ model = User
+ form_class = ChangePassForm
+ success_url = reverse_lazy('users:profile')
+
+ def get_form_kwargs(self):
+ kwargs = super(ChangePassView, self).get_form_kwargs()
+
+ kwargs.update({'user': self.request.user})
+ kwargs.update({'request': self.request})
+
+ return kwargs
+
+ def get_object(self):
+ user = get_object_or_404(User, email = self.request.user.email)
+
+ return user
+
+ def form_valid(self, form):
+ form.save()
+
+ messages.success(self.request, _('Password changed successfully!'))
+
+ return super(ChangePassView, self).form_valid(form)
+
+ def get_context_data (self, **kwargs):
+ context = super(ChangePassView, self).get_context_data(**kwargs)
+ context['title'] = _("Change Password")
+
+ return context
+
class Profile(LoginRequiredMixin, generic.DetailView):
login_url = reverse_lazy("users:login")
redirect_field_name = 'next'
@@ -187,7 +225,7 @@ class Profile(LoginRequiredMixin, generic.DetailView):
template_name = 'users/profile.html'
def get_object(self):
- user = get_object_or_404(User, username = self.request.user.username)
+ user = get_object_or_404(User, email = self.request.user.email)
return user
@@ -254,12 +292,12 @@ def login(request):
user = authenticate(username=username, password=password)
if user is not None:
login_user(request, user)
- return redirect(reverse("users:login"))
+ return redirect(reverse("home"))
else:
messages.add_message(request, messages.ERROR, _('E-mail or password are incorrect.'))
context["username"] = username
elif request.user.is_authenticated:
- return redirect('home')
+ return redirect(reverse('home'))
return render(request,"users/login.html",context)
--
libgit2 0.21.2