Merge branch 'master' into task/3781/resend_activation_mail

This commit is contained in:
PCoder 2017-09-26 01:18:02 +05:30
commit 81bc5d5555
5 changed files with 41 additions and 40 deletions

View file

@ -16,7 +16,7 @@ from django.http import Http404, HttpResponseRedirect, HttpResponse
from django.shortcuts import redirect, render
from django.utils.http import urlsafe_base64_decode
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import get_language, ugettext_lazy as _
from django.utils.translation import ugettext
from django.views.generic import (
View, CreateView, FormView, ListView, DetailView, DeleteView,
@ -330,7 +330,7 @@ class PasswordResetConfirmView(PasswordResetConfirmViewMixin):
messages.success(request, _('Password has been reset.'))
# Change opennebula password
opennebula_client.change_user_password(new_password)
opennebula_client.change_user_password(user.password)
return self.form_valid(form)
else: