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
AiC and REST login
[myslice.git]
/
portal
/
homeview.py
diff --git
a/portal/homeview.py
b/portal/homeview.py
index
f14a49a
..
fbe3ed6
100644
(file)
--- a/
portal/homeview.py
+++ b/
portal/homeview.py
@@
-23,6
+23,8
@@
from portal.account import Account, get_expiration
from portal.models import PendingSlice
from portal.actions import authority_check_pis, get_jfed_identity, get_myslice_account
from portal.models import PendingSlice
from portal.actions import authority_check_pis, get_jfed_identity, get_myslice_account
+from myslice.settings import logger
+
import activity.user
class HomeView (FreeAccessView, ThemeView):
import activity.user
class HomeView (FreeAccessView, ThemeView):
@@
-86,7
+88,7
@@
class HomeView (FreeAccessView, ThemeView):
#else:
# pi = "is_pi"
user_email = str(self.request.user)
#else:
# pi = "is_pi"
user_email = str(self.request.user)
- pi = authority_check_pis(self.request, user_email)
+
#
pi = authority_check_pis(self.request, user_email)
# check if the user has creds or not
if acc_user_cred == {} or acc_user_cred == 'N/A':
# check if the user has creds or not
if acc_user_cred == {} or acc_user_cred == 'N/A':
@@
-104,7
+106,7
@@
class HomeView (FreeAccessView, ThemeView):
pending_slices.append(slices.slice_name)
env['pending_slices'] = pending_slices
pending_slices.append(slices.slice_name)
env['pending_slices'] = pending_slices
- env['pi'] = pi
+
#
env['pi'] = pi
env['user_cred'] = user_cred
except Exception as e:
print e
env['user_cred'] = user_cred
except Exception as e:
print e
@@
-131,7
+133,11
@@
class HomeView (FreeAccessView, ThemeView):
# log user activity
activity.user.login(self.request, "error")
env['state'] = "Your username and/or password were incorrect."
# log user activity
activity.user.login(self.request, "error")
env['state'] = "Your username and/or password were incorrect."
+
+ env['next'] = request.POST.get('next',None)
env['request'] = request
env['request'] = request
+ if env['next']:
+ return HttpResponseRedirect(env['next'])
return render_to_response(self.template,env, context_instance=RequestContext(request))
def get (self, request, state=None):
return render_to_response(self.template,env, context_instance=RequestContext(request))
def get (self, request, state=None):
@@
-168,7
+174,7
@@
class HomeView (FreeAccessView, ThemeView):
#else:
# pi = "is_pi"
user_email = str(self.request.user)
#else:
# pi = "is_pi"
user_email = str(self.request.user)
- pi = authority_check_pis(self.request, user_email)
+
#
pi = authority_check_pis(self.request, user_email)
# check if the user has creds or not
if acc_user_cred == {} or acc_user_cred == 'N/A':
user_cred = 'no_creds'
# check if the user has creds or not
if acc_user_cred == {} or acc_user_cred == 'N/A':
user_cred = 'no_creds'
@@
-185,19
+191,20
@@
class HomeView (FreeAccessView, ThemeView):
pending_slices.append(slices.slice_name)
env['pending_slices'] = pending_slices
pending_slices.append(slices.slice_name)
env['pending_slices'] = pending_slices
- env['pi'] = pi
+
#
env['pi'] = pi
env['user_cred'] = user_cred
env['person'] = self.request.user
else:
env['person'] = None
env['user_cred'] = user_cred
env['person'] = self.request.user
else:
env['person'] = None
- except Exception as e:
- print e
- env['person'] = None
- env['state'] = "Your session has expired"
+
except Exception as e:
+
print e
+
env['person'] = None
+
env['state'] = "Your session has expired"
env['theme'] = self.theme
env['section'] = "Dashboard"
env['theme'] = self.theme
env['section'] = "Dashboard"
-
+ logger.debug("homeview called")
+ env['next'] = request.GET.get('next',None)
env['username']=the_user(request)
env['topmenu_items'] = topmenu_items(None, request)
env['request'] = request
env['username']=the_user(request)
env['topmenu_items'] = topmenu_items(None, request)
env['request'] = request