Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 13 Aug 2013 16:09:54 +0000 (18:09 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 13 Aug 2013 16:09:54 +0000 (18:09 +0200)
1  2 
portal/views.py

diff --combined portal/views.py
@@@ -62,6 -62,7 +62,7 @@@ class DashboardView(TemplateView)
          page.enqueue_query(slice_query)
          page.enqueue_query(auth_query)
  
+         page.expose_js_metadata()
          page.expose_queries()
  
          slicelist = SimpleList(
@@@ -488,7 -489,7 +489,7 @@@ def acc_process(request)
          #approach borrowed from register view     
          #new_user = PendingUser.objects.create_inactive_user(edited_first_name, edited_last_name, email,  password, site) 
          #conventional approach
 -        #b = PendingUser(first_name=edited_first_name, edited_last_name=last_name)
 +        #b = PendingUser(first_name=edited_first_name, last_name=edited_last_name)
          #b.save()
          
          # select and update [will be used throughout this view]
  def register_4m_f4f(request):
      return render(request, 'register_4m_f4f.html')
  
 +def reg_4m_f4f_process(request):
 +    if 'submit' in request.POST:
 +        return HttpResponse('Registration Successful. Please wait for account validation')
 +        
 +    
 +
  # view for contact form
  def contact(request):
      if request.method == 'POST': # If the form has been submitted...