X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=c536322e732074ff4e36025c8f73160bf3d13d8d;hb=49f0381d60a23cd5b0bf546e97b0b5652de81b14;hp=e554f1bdfc4484be246e70d673c165d3353c0bd5;hpb=2f0ca597d050216c92df1ba6bf472d2c937fe7ef;p=myslice.git diff --git a/portal/views.py b/portal/views.py index e554f1bd..c536322e 100644 --- a/portal/views.py +++ b/portal/views.py @@ -24,7 +24,6 @@ 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 @@ -38,7 +37,7 @@ from plugins.pres_view import PresView from portal.event import Event from portal import signals -from portal.forms import SliceRequestForm, ContactForm +from portal.forms import SliceRequestForm from portal.util import RegistrationView, ActivationView from portal.models import PendingUser, PendingSlice from portal.actions import authority_get_pi_emails, get_request_by_authority, manifold_add_user, manifold_update_user @@ -48,80 +47,6 @@ from unfold.page import Page from myslice.viewutils import topmenu_items, the_user from django.http import HttpResponseRedirect, HttpResponse -#class for my_account -@login_required -#my_acc form value processing -def account_process(request): - user_query = Query().get('local:user').select('password','config') - user_details = execute_query(request, user_query) - - if 'submit_name' in request.POST: - edited_first_name = request.POST['fname'] - edited_last_name = request.POST['lname'] - - config={} - for user_config in user_details: - #email = user_detail['email'] - if user_config['config']: - config = json.loads(user_config['config']) - config['firstname'] = edited_first_name - config['lastname'] = edited_last_name - config['authority'] = config.get('authority','Unknown Authority') - updated_config = json.dumps(config) - - # updating config local:user in manifold - user_params = { 'config': updated_config} - manifold_update_user(request,user_params) - # this will be depricated, we will show the success msg in same page - return HttpResponse('Sucess: First Name and Last Name Updated!') - elif 'submit_pass' in request.POST: - edited_password = request.POST['password'] - - for user_pass in user_details: - user_pass['password'] = edited_password - #updating password in local:user - user_params = { 'password': user_pass['password']} - manifold_update_user(request,user_params) - - return HttpResponse('Success: Password Changed!!') - elif 'generate' in request.POST: - # Generate public and private keys using SFA Library - from sfa.trust.certificate import Keypair - k = Keypair(create=True) - public_key = k.get_pubkey_string() - private_key = k.as_pem() - private_key = ''.join(private_key.split()) - public_key = "ssh-rsa " + public_key - # Saving to DB - keypair = '{"user_public_key":"'+ public_key + '", "user_private_key":"'+ private_key + '"}' -# keypair = re.sub("\r", "", keypair) -# keypair = re.sub("\n", "\\n", keypair) -# #keypair = keypair.rstrip('\r\n') -# keypair = ''.join(keypair.split()) - get_user.keypair = keypair - get_user.save() - return HttpResponse('Success: New Keypair Generated! %s' % keypair) - - elif 'upload_key' in request.POST: - up_file = request.FILES['pubkey'] - file_content = up_file.read() - file_name = up_file.name - file_extension = os.path.splitext(file_name)[1] - allowed_extension = ['.pub','.txt'] - if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content): - file_content = '{"user_public_key":"'+ file_content +'"}' - file_content = re.sub("\r", "", file_content) - file_content = re.sub("\n", "\\n",file_content) - file_content = ''.join(file_content.split()) - get_user.keypair = file_content - get_user.save() - return HttpResponse('Success: Publickey uploaded! Old records overwritten') - else: - return HttpResponse('Please upload a valid RSA public key [.txt or .pub].') - - else: - message = 'You submitted an empty form.' - return HttpResponse(message) def register_4m_f4f(request): errors = [] @@ -234,38 +159,6 @@ def register_4m_f4f(request): }) -# view for contact form -def contact(request): - if request.method == 'POST': # If the form has been submitted... - form = ContactForm(request.POST) # A form bound to the POST data - if form.is_valid(): # All validation rules pass - # Process the data in form.cleaned_data - first_name = form.cleaned_data['first_name'] - last_name = form.cleaned_data['last_name'] - affiliation = form.cleaned_data['affiliation'] - subject = form.cleaned_data['subject'] - message = form.cleaned_data['message'] - email = form.cleaned_data['email'] # email of the sender - cc_myself = form.cleaned_data['cc_myself'] - - #recipients = authority_get_pi_emails(authority_hrn) - recipients = ['yasin.upmc@gmail.com'] - if cc_myself: - recipients.append(email) - - from django.core.mail import send_mail - send_mail("Onelab user submitted a query ", [first_name,last_name,affiliation,subject,message], email, recipients) - return render(request,'contact_sent.html') # Redirect after POST - else: - form = ContactForm() # An unbound form - - return render(request, 'contact.html', { - 'form': form, - 'topmenu_items': topmenu_items('Contact Us', request), - 'username': the_user (request) - - }) - @login_required def slice_request(request): errors = []