git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Scheduler: adding/removing resources enforce warnings and recount number of unconfigu...
[myslice.git]
/
portal
/
django_passresetview.py
diff --git
a/portal/django_passresetview.py
b/portal/django_passresetview.py
index
396046f
..
6997008
100644
(file)
--- a/
portal/django_passresetview.py
+++ b/
portal/django_passresetview.py
@@
-72,7
+72,6
@@
import json
from random import choice
from random import choice
-from django.core.mail import send_mail
from django.contrib import messages
from django.views.generic import View
from django.shortcuts import render
from django.contrib import messages
from django.views.generic import View
from django.shortcuts import render
@@
-88,7
+87,7
@@
from portal.actions import manifold_update_user
from portal.forms import PassResetForm
from portal.actions import manifold_update_user
from portal.forms import PassResetForm
from portal.actions import manifold_update_user
-from theme import ThemeView
+from
myslice.
theme import ThemeView
# 4 views for password reset:
# - password_reset sends the mail
# 4 views for password reset:
# - password_reset sends the mail
@@
-130,9
+129,12
@@
def password_reset(request, is_admin_site=False,
if flag == 0:
messages.error(request, 'Sorry, this email is not registered.')
if flag == 0:
messages.error(request, 'Sorry, this email is not registered.')
-
return render(request, themeview.theme,
{
+
context =
{
'form': form,
'form': form,
- })
+ 'theme': themeview.theme
+ }
+ return TemplateResponse(request, themeview.template, context,current_app=current_app)
+
### end of email check in manifold ###
opts = {
### end of email check in manifold ###
opts = {
@@
-248,7
+250,7
@@
def password_reset_complete(request,
}
if extra_context is not None:
context.update(extra_context)
}
if extra_context is not None:
context.update(extra_context)
- return TemplateResponse(request, themeview.t
hem
e, context,
+ return TemplateResponse(request, themeview.t
emplat
e, context,
current_app=current_app)
current_app=current_app)