git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: merge conflic /portal/views.py
[unfold.git]
/
portal
/
views.py
diff --git
a/portal/views.py
b/portal/views.py
index
be1b77c
..
4df9fc8
100644
(file)
--- a/
portal/views.py
+++ b/
portal/views.py
@@
-27,6
+27,8
@@
from django.contrib import messages
from django.views.generic import View
from django.views.generic.base import TemplateView
from django.shortcuts import render
from django.views.generic import View
from django.views.generic.base import TemplateView
from django.shortcuts import render
+from django.utils.decorators import method_decorator
+from django.contrib.auth.decorators import login_required
from plugins.lists.simplelist import SimpleList
from plugins.hazelnut import Hazelnut
from plugins.lists.simplelist import SimpleList
from plugins.hazelnut import Hazelnut
@@
-49,6
+51,11
@@
import os, re
class DashboardView(TemplateView):
template_name = "dashboard.html"
class DashboardView(TemplateView):
template_name = "dashboard.html"
+
+ #This view requires login
+ @method_decorator(login_required)
+ def dispatch(self, *args, **kwargs):
+ return super(DashboardView, self).dispatch(*args, **kwargs)
def get_context_data(self, **kwargs):
# We might have slices on different registries with different user accounts
def get_context_data(self, **kwargs):
# We might have slices on different registries with different user accounts
@@
-472,16
+479,6
@@
class DashboardView(TemplateView):
# DEPRECATED # context.update(page.prelude_env())
# DEPRECATED # return context
# DEPRECATED # context.update(page.prelude_env())
# DEPRECATED # return context
-
-
-# View for my_account form
-def my_account(request):
- return render(request, 'my_account.html', {
- #'form': form,
- 'topmenu_items': topmenu_items('My Account', request),
- 'username': the_user (request)
- })
-
# View for platforms
class PlatformsView(TemplateView):
template_name = "platforms.html"
# View for platforms
class PlatformsView(TemplateView):
template_name = "platforms.html"
@@
-534,6
+531,8
@@
class PlatformsView(TemplateView):
return context
return context
+
+
# View for 1 platform and its details
class PlatformView(TemplateView):
template_name = "platform.html"
# View for 1 platform and its details
class PlatformView(TemplateView):
template_name = "platform.html"
@@
-591,6
+590,18
@@
class PlatformView(TemplateView):
return context
return context
+
+@login_required
+# View for my_account form
+def my_account(request):
+ return render(request, 'my_account.html', {
+ #'form': form,
+ 'topmenu_items': topmenu_items('My Account', request),
+ 'username': the_user (request)
+ })
+
+
+@login_required
#my_acc form value processing
def acc_process(request):
# getting the user_id from the session [now hardcoded]
#my_acc form value processing
def acc_process(request):
# getting the user_id from the session [now hardcoded]
@@
-684,11
+695,17
@@
def acc_process(request):
def register_4m_f4f(request):
errors = []
def register_4m_f4f(request):
errors = []
+
+ authorities_query = Query.get('authority').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc']).select('name', 'authority_hrn')
+ #authorities_query = Query.get('authority').select('authority_hrn')
+ authorities = execute_query(request, authorities_query)
+
if request.method == 'POST':
#get_email = PendingUser.objects.get(email)
reg_fname = request.POST.get('firstname', '')
reg_lname = request.POST.get('lastname', '')
reg_aff = request.POST.get('affiliation','')
if request.method == 'POST':
#get_email = PendingUser.objects.get(email)
reg_fname = request.POST.get('firstname', '')
reg_lname = request.POST.get('lastname', '')
reg_aff = request.POST.get('affiliation','')
+ reg_auth = request.POST.get('authority_hrn', '')
reg_email = request.POST.get('email','').lower()
#POST value validation
reg_email = request.POST.get('email','').lower()
#POST value validation
@@
-704,6
+721,7
@@
def register_4m_f4f(request):
errors.append('Affiliation may contain only letters, numbers, spaces and @/./+/-/_ characters.')
#return HttpResponse("Only Letters, Numbers and _ is allowed in Affiliation")
#return render(request, 'register_4m_f4f.html')
errors.append('Affiliation may contain only letters, numbers, spaces and @/./+/-/_ characters.')
#return HttpResponse("Only Letters, Numbers and _ is allowed in Affiliation")
#return render(request, 'register_4m_f4f.html')
+ # XXX validate authority hrn !!
if PendingUser.objects.filter(email__iexact=reg_email):
errors.append('Email already registered.Please provide a new email address.')
#return HttpResponse("Email Already exists")
if PendingUser.objects.filter(email__iexact=reg_email):
errors.append('Email already registered.Please provide a new email address.')
#return HttpResponse("Email Already exists")
@@
-757,6
+775,7
@@
def register_4m_f4f(request):
#b.save()
if not errors:
b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff,
#b.save()
if not errors:
b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff,
+ authority_hrn=reg_auth,
email=reg_email, password=request.POST['password'], keypair=keypair)
b.save()
return render(request, 'user_register_complete.html')
email=reg_email, password=request.POST['password'], keypair=keypair)
b.save()
return render(request, 'user_register_complete.html')
@@
-767,8
+786,10
@@
def register_4m_f4f(request):
'firstname': request.POST.get('firstname', ''),
'lastname': request.POST.get('lastname', ''),
'affiliation': request.POST.get('affiliation', ''),
'firstname': request.POST.get('firstname', ''),
'lastname': request.POST.get('lastname', ''),
'affiliation': request.POST.get('affiliation', ''),
+ 'authority_hrn': request.POST.get('authority_hrn', ''),
'email': request.POST.get('email', ''),
'password': request.POST.get('password', ''),
'email': request.POST.get('email', ''),
'password': request.POST.get('password', ''),
+ 'authorities': authorities
})
})
@@
-803,7
+824,7
@@
def contact(request):
})
})
-
+@login_required
def slice_request(request):
if request.method == 'POST': # If the form has been submitted...
form = SliceRequestForm(request.POST) # A form bound to the POST data
def slice_request(request):
if request.method == 'POST': # If the form has been submitted...
form = SliceRequestForm(request.POST) # A form bound to the POST data
@@
-1144,8
+1165,6
@@
class ValidatePendingView(TemplateView):
for user in pending_users:
auth_hrn = user.authority_hrn
for user in pending_users:
auth_hrn = user.authority_hrn
- if not auth_hrn:
- auth_hrn = "fed4fire.upmc" # XXX HARDCODED
request = {}
request['type'] = 'user'
request = {}
request['type'] = 'user'