From 397592b94462b1afae8bae62bd0596cd3b5913af Mon Sep 17 00:00:00 2001
From: Yasin Rahman <yasin.upmc@gmail.com>
Date: Mon, 12 Oct 2015 16:13:20 +0200
Subject: [PATCH] CreateSlice: url and purpose no longer required

---
 portal/slicerequestview.py              | 20 ++++++++++----------
 portal/templates/slicerequest_view.html |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index a2b0dd04..9ccaf763 100644
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -39,8 +39,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
 
         errors = []
         slice_name =''
-        purpose=''
-        url=''
+        #purpose=''
+        #url=''
         authority_hrn = None
         authority_name = None
         # Retrieve the list of authorities
@@ -138,8 +138,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                 'authority_hrn'     : authority_hrn,
                 'organization'      : request.POST.get('org_name', ''),
                 'slice_name'        : slice_name,
-                'url'               : request.POST.get('url', ''),
-                'purpose'           : request.POST.get('purpose', ''),
+                #'url'               : request.POST.get('url', ''),
+                #'purpose'           : request.POST.get('purpose', ''),
                 'current_site'      : current_site
             }
 
@@ -174,11 +174,11 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
 
 
     
-            purpose = slice_request['purpose']
-            if purpose is None or purpose == '':
-                errors.append('Experiment purpose is mandatory')
+           # purpose = slice_request['purpose']
+           # if purpose is None or purpose == '':
+           #     errors.append('Experiment purpose is mandatory')
 
-            url = slice_request['url']
+            #url = slice_request['url']
 
             if not errors:
                 if is_pi(request, user_hrn, authority_hrn):
@@ -203,10 +203,10 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             'topmenu_items': topmenu_items_live('Request a slice', page),
             'errors': errors,
             'slice_name': slice_name,
-            'purpose': purpose,
+            #'purpose': purpose,
             'email': user_email,
             'user_hrn': user_hrn,
-            'url': url,
+            #'url': url,
             'pi': pi,
             'authority_name': authority_name,        
             'authority_hrn': user_authority,        
diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html
index 07a45971..2bb1e50f 100644
--- a/portal/templates/slicerequest_view.html
+++ b/portal/templates/slicerequest_view.html
@@ -48,7 +48,7 @@
 			      <label>
 			          Provide an URL for your experiment (not required)
 			      </label>
-			      <input type="text" class="form-control" name="url" id="url" style="width:100%" placeholder="Experiment URL (if one exists)"
+			      <!-- <input type="text" class="form-control" name="url" id="url" style="width:100%" placeholder="Experiment URL (if one exists)"
 				        title="Please provide the url of your experiment" value="{{url}}">
 			  </div>
 			  <div class="form-group">
@@ -57,7 +57,7 @@
                    </label>
 			  	  <textarea id="purpose" name="purpose" class="form-control" rows="6" placeholder="Experiment description" style="width:100%" 
 				        title="Description of your experiment" required="required">{{ purpose }}</textarea>
-			  </div>
+			  </div> -->
 			  <button type="submit" id=submit_pi class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
 			</form>
 	
-- 
2.43.0