X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=6e6bb2d9ebd15d7929b8fde8fab9f9e84ffc458b;hb=0b28b9a05826740f82decbd9e29662bf008e3b5c;hp=de2a9971816d9469520a8106be47913b6ab3ca90;hpb=00ccef62a48c74fabda3b047fd78a7411e73f691;p=myslice.git diff --git a/portal/views.py b/portal/views.py index de2a9971..6e6bb2d9 100644 --- a/portal/views.py +++ b/portal/views.py @@ -24,6 +24,7 @@ import os.path, re import json +from django.http import HttpResponseRedirect, HttpResponse from django.views.generic.base import TemplateView from django.shortcuts import render from django.template.loader import render_to_string @@ -31,6 +32,8 @@ from django.core.mail import send_mail from django.utils.decorators import method_decorator from django.contrib.auth.decorators import login_required +from myslice.viewutils import topmenu_items, the_user + from plugins.lists.simplelist import SimpleList from plugins.hazelnut import Hazelnut from plugins.pres_view import PresView @@ -44,83 +47,6 @@ from portal.actions import authority_get_pi_emails, get_request_by_ from manifold.manifoldapi import execute_query from manifold.core.query import Query 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 = [] @@ -233,75 +159,6 @@ def register_4m_f4f(request): }) -@login_required -def slice_request(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) - - authority_hrn_tuple = [] - for authority in authorities: - authority_hrn_tuple.append((authority['authority_hrn'], authority['name'])) - authority_hrn_initial = {'authority_hrn': authority_hrn_tuple} - - # request.POST or None ? - if request.method == 'POST': - # The form has been submitted - form = SliceRequestForm(request.POST, initial=authority_hrn_initial) - - if form.is_valid(): - slice_name = form.cleaned_data['slice_name'] - authority_hrn = form.cleaned_data['authority_hrn'] - number_of_nodes = form.cleaned_data['number_of_nodes'] - type_of_nodes = form.cleaned_data['type_of_nodes'] - purpose = form.cleaned_data['purpose'] - - s = PendingSlice( - slice_name = slice_name, - authority_hrn = authority_hrn, - number_of_nodes = number_of_nodes, - type_of_nodes = type_of_nodes, - purpose = purpose - ) - s.save() - - # All validation rules pass; process data in form.cleaned_data - # slice_name, number_of_nodes, type_of_nodes, purpose - email = form.cleaned_data['email'] # email of the sender - cc_myself = form.cleaned_data['cc_myself'] - - # The recipients are the PI of the authority - recipients = authority_get_pi_emails(authority_hrn) - #recipients = ['yasin.upmc@gmail.com','jordan.auge@lip6.fr'] - if cc_myself: - recipients.append(email) - msg = render_to_string('slice_request_email.txt', form.cleaned_data) - send_mail("Onelab New Slice request form submitted", msg, email, recipients) - - return render(request,'slicereq_recvd.html') # Redirect after POST - else: - form = SliceRequestForm(initial=authority_hrn_initial) - -# template_env = {} -# template_env['form'] = form -# template_env['topmenu_items'] = topmenu_items('Request a slice', request) -# template_env['unfold1_main'] = render(request, 'slice_request_.html', { -# 'form': form, -# }) -# from django.shortcuts import render_to_response -# from django.template import RequestContext -# return render_to_response ('view-unfold1.html',template_env, -# context_instance=RequestContext(request)) - - return render(request, 'slice_request.html', { - 'form': form, - 'topmenu_items': topmenu_items('Request a slice', request), - 'username': the_user (request) - }) - - class PresViewView(TemplateView): template_name = "view-unfold1.html"