project request fix

diff --git a/portal/projectrequestview.py b/portal/projectrequestview.py
index 51f33dd..5fd7d8c 100644 (file)
--- a/portal/projectrequestview.py
+++ b/portal/projectrequestview.py
@@ -109,6 +109,10 @@ class ProjectRequestView(LoginRequiredAutoLogoutView, ThemeView):
                     'project_name'      : wsgi_request.POST.get('project_name', ''),
                     'purpose'           : wsgi_request.POST.get('purpose', ''),
                 }
+                
+                # for new projects max project_name length is 10
+                if (len(post['project_name']) >10):
+                    errors.append('Project name can be maximum 10 characters long')
 
                 #if (post['authority_hrn'] is None or post['authority_hrn'] == ''):
                 #    errors.append('Organization is mandatory')
@@ -121,12 +125,7 @@ class ProjectRequestView(LoginRequiredAutoLogoutView, ThemeView):
 
             # What kind of project name is valid?
             if (post['project_name'] is None or post['project_name'] == ''):
-                errors.append('Project name is mandatory')
-
-            # max project_name length is 10
-            if (len(post['project_name']) >10):
-                errors.append('Project name can be maximum 10 characters long')
-
+                errors.append('Project name is mandatory')   
             
             if not errors:
                 logger.info("is_pi on auth_hrn = {}".format(user_authority))

diff --git a/portal/templates/fed4fire/fed4fire_projectrequest_view.html b/portal/templates/fed4fire/fed4fire_projectrequest_view.html
index be59750..45d8a1a 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_projectrequest_view.html
+++ b/portal/templates/fed4fire/fed4fire_projectrequest_view.html
@@ -1,11 +1,12 @@
 {% extends "layout.html" %}
 {% load i18n %}
-
-{% block content %}
+{% block head %}
 <script src="{{ STATIC_URL }}js/jquery-ui.js"></script>
 <script src="{{ STATIC_URL }}js/jquery-ui-combobox.js"></script>
 <link rel='stylesheet' type='text/css' href="{{ STATIC_URL }}css/jquery-ui.css">
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/jquery.ui.combobox.css">
+{% endblock head %}
+{% block content %}
 <br />
 <div class="row">
     <div class="col-md-12">
@@ -85,7 +86,10 @@
                 <form role="form" method="post" action="/portal/project_request">
                 {% csrf_token %}
                 <div id="project_loading" style="display:inline;"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div> 
-                <select id="projects" name="project_name" style="display:none;"></select> <div style="display:none;" id="projects_button"><input type="submit" id="join" name="join" value="Join" class="btn"/></div>
+                <select id="projects" name="project_name" style="display:none;"></select> 
+                <div style="display:none;" id="projects_button">
+                    <input type="submit" id="join" name="join" value="Join" class="btn"/>
+                </div>
                 </form>
             </div>
             <div class="col-md-6">