Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

[myslice.git] / portal / views.py

diff --git a/portal/views.py b/portal/views.py
index ee867a6..f72f6ce 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -21,10 +21,10 @@
 # this program; see the file COPYING.  If not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-from django.conf                 import settings
-from django.contrib.sites.models import Site, RequestSite
-from django.contrib              import messages
-from django.views.generic        import View
+import os.path, re
+import json
+
+#from django.views.generic        import View
 from django.views.generic.base   import TemplateView
 from django.shortcuts            import render
 from django.template.loader      import render_to_string
@@ -36,7 +36,6 @@ from plugins.lists.simplelist    import SimpleList
 from plugins.hazelnut            import Hazelnut
 from plugins.pres_view           import PresView
 from portal.event import Event
-import json
 
 from portal                      import signals
 from portal.forms                import SliceRequestForm, ContactForm
@@ -49,9 +48,6 @@ from unfold.page                 import Page
 from myslice.viewutils           import topmenu_items, the_user
 from django.http                 import HttpResponseRedirect, HttpResponse
 
-from M2Crypto                    import Rand, RSA, BIO
-import os, re
-
 #class for my_account
 class AccountView(TemplateView):
     template_name = "my_account.html"
@@ -216,7 +212,7 @@ def register_4m_f4f(request):
         #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_aff = request.POST.get('affiliation','')
         reg_auth = request.POST.get('authority_hrn', '')
         reg_email = request.POST.get('email','').lower()
         
@@ -229,8 +225,8 @@ def register_4m_f4f(request):
             errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
             #return HttpResponse("Only Letters, Numbers, - and _ is allowed in Last name")
             #return render(request, 'register_4m_f4f.html')
-        if (re.search(r'^[\w+\s.@+-]+$', reg_aff) == None):
-            errors.append('Affiliation may contain only letters, numbers, spaces and @/./+/-/_ characters.')
+#        if (re.search(r'^[\w+\s.@+-]+$', reg_aff) == None):
+#            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 !!
@@ -273,7 +269,7 @@ def register_4m_f4f(request):
             b = PendingUser(
                 first_name=reg_fname, 
                 last_name=reg_lname, 
-                affiliation=reg_aff,
+                #affiliation=reg_aff,
                 authority_hrn=reg_auth,
                 email=reg_email, 
                 password=request.POST['password'],
@@ -285,7 +281,7 @@ def register_4m_f4f(request):
             ctx = {
                 first_name   : reg_fname, 
                 last_name    : reg_lname, 
-                affiliation  : reg_aff,
+                #affiliation  : reg_aff,
                 authority_hrn: reg_auth,
                 email        : reg_email, 
                 keypair      : keypair,
@@ -306,7 +302,7 @@ def register_4m_f4f(request):
         'errors': errors,
         'firstname': request.POST.get('firstname', ''),
         'lastname': request.POST.get('lastname', ''),
-        'affiliation': request.POST.get('affiliation', ''),
+        #'affiliation': request.POST.get('affiliation', ''),
         'authority_hrn': request.POST.get('authority_hrn', ''),
         'email': request.POST.get('email', ''),
         'password': request.POST.get('password', ''),