X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=blobdiff_plain;f=portal%2Fslicerequestview.py;fp=portal%2Fslicerequestview.py;h=0a8f99899730d874e96adabccaf4a09260e4f97f;hp=a880d3914a9dc5d5e0089a546661bd294efaed31;hb=958afd7b86e20e1529c2f7cc4662b47205945c40;hpb=6f1b4de65529aa12b6acad29575335bd8692837a

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index a880d391..0a8f9989 100644
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -17,6 +17,7 @@ from myslice.theme import ThemeView
 import json, time, re
 
 import activity.user
+theme = ThemeView()
 
 class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
     template_name = 'slicerequest_view.html'
@@ -148,9 +149,17 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             if (re.search(r'^[A-Za-z0-9_]*$', slice_name) == None):
                 errors.append('Slice name may contain only letters, numbers, and underscore.')
             
-            organization = slice_request['organization']    
-            if (organization is None or organization == ''):
-                errors.append('Organization is mandatory')
+            organization = slice_request['organization']
+            if theme.theme == 'fed4fire':
+                if (organization is None or organization == ''):
+                    errors.append('Selecting project is mandatory')
+            else:
+                if (organization is None or organization == ''):
+                    errors.append('Organization is mandatory')
+
+            slice_length= len(slice_request['slice_name'])
+            if slice_length >19:
+                errors.append('Slice name can be maximum 19 characters long')