Slice request: handles url as an onelab-data field

diff --git a/portal/actions.py b/portal/actions.py
index 8ca3acf..a2afbfc 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -429,6 +429,7 @@ def create_slice(wsgi_request, request):
         'slice_hrn'        : hrn, 
         'slice_urn'        : urn,
         'slice_type'       : request['type'],
+        'url'              : request['number_of_nodes'],
         'users'            : user_hrns,
         'slice_enabled'    : True
     }
@@ -455,7 +456,7 @@ def create_pending_slice(wsgi_request, request, email):
         slice_name      = request['slice_name'],
         user_hrn        = request['user_hrn'],
         authority_hrn   = request['authority_hrn'],
-        number_of_nodes = request['exp_url'],
+        number_of_nodes = request['url'],
         purpose         = request['purpose'],
     )
     s.save()

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 90cb587..0f58669 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -33,7 +33,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
         errors = []
         slice_name =''
         purpose=''
-        exp_url=''
+        url=''
         authority_hrn = None
         authority_name = None
         # Retrieve the list of authorities
@@ -115,7 +115,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                 'authority_hrn'     : authority_hrn,
                 'organization'      : wsgi_request.POST.get('org_name', ''),
                 'slice_name'        : wsgi_request.POST.get('slice_name', ''),
-                'exp_url'           : wsgi_request.POST.get('exp_url', ''),
+                'url'               : wsgi_request.POST.get('url', ''),
                 'purpose'           : wsgi_request.POST.get('purpose', ''),
                 'current_site'      : current_site
             }
@@ -148,7 +148,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             if (purpose is None or purpose == ''):
                 errors.append('Experiment purpose is mandatory')
 
-            exp_url = slice_request['exp_url']
+            url = slice_request['url']
 
             if not errors:
                 if is_pi(wsgi_request, user_hrn, authority_hrn):
@@ -173,7 +173,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             'purpose': purpose,
             'email': user_email,
             'user_hrn': user_hrn,
-            'exp_url': exp_url,
+            'url': url,
             'pi': pi,
             'authority_name': authority_name,        
             'authority_hrn': user_authority,        

diff --git a/portal/templates/onelab/onelab_slicerequest_view.html b/portal/templates/onelab/onelab_slicerequest_view.html
index 47068c4..aadcda9 100644 (file)
--- a/portal/templates/onelab/onelab_slicerequest_view.html
+++ b/portal/templates/onelab/onelab_slicerequest_view.html
@@ -13,7 +13,7 @@
        {% if errors %}
        <div class="row">
                <div class="col-md-12">
-               <ul>
+               <ul class="error">
                  {% for error in errors %}
                  <li>{{ error }}</li>
                  {% endfor %}
@@ -43,8 +43,8 @@
                                {%endif%}
                          </div>
                          <div class="form-group">
-                           <input type="text" class="form-control" name="exp_url" id="exp_url" style="width:300px" placeholder="Experiment URL (if one exists)"
-                               title="Please provide the url of your experiment if you have one." value="{{exp_url}}">
+                           <input type="text" class="form-control" name="url" id="url" style="width:300px" placeholder="Experiment URL (if one exists)"
+                               title="Please provide the url of your experiment if you have one." value="{{url}}">
                          </div>
                          <div class="form-group">
                                <textarea id="purpose" name="purpose" class="form-control" rows="6" placeholder="Experiment purpose" style="width:300px" 

diff --git a/portal/templates/slice_request_email.html b/portal/templates/slice_request_email.html
index 8306c2b..2c4da62 100644 (file)
--- a/portal/templates/slice_request_email.html
+++ b/portal/templates/slice_request_email.html
@@ -3,7 +3,7 @@
 <h1>NEW SLICE REQUEST</h1>
 <br>
 <b>Slice name      :</b> {{slice_name}}</br>
-<b>URL                            :</b> {{exp_url}}</br>
+<b>URL                            :</b> {{url}}</br>
 <b>Purpose         :</b> {{purpose}}</br>
 <b>Organization           :</b> {{organization}}</br>
 <b>Email           :</b> {{email}}</br>

diff --git a/portal/templates/slice_request_email.txt b/portal/templates/slice_request_email.txt
index c8a51b5..dfe4f12 100644 (file)
--- a/portal/templates/slice_request_email.txt
+++ b/portal/templates/slice_request_email.txt
@@ -1,7 +1,7 @@
 NEW SLICE REQUEST
 
 Slice name      : {{slice_name}}
-URL                    : {{exp_url}}
+URL                    : {{url}}
 Purpose         : {{purpose}}
 Email           : {{email}}
 Organization   : {{organization}}