[whimsy] 02/02: require project if user is specified

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit cb0bf176c4f7c2410f45cd8c04b88263456d2364
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Jul 18 10:33:10 2017 -0400

    require project if user is specified
---
 www/secretary/workbench/public/secmail.css     | 2 +-
 www/secretary/workbench/views/forms/icla.js.rb | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/secretary/workbench/public/secmail.css b/www/secretary/workbench/public/secmail.css
index fcf4996..12cb9fb 100644
--- a/www/secretary/workbench/public/secmail.css
+++ b/www/secretary/workbench/public/secmail.css
@@ -60,7 +60,7 @@ table.form {
   width: 100%;
 }
 
-.form input:invalid, .form textarea:invalid {
+.form input:invalid, .form select:invalid, .form textarea:invalid {
   border: 1px solid red;
 }
 
diff --git a/www/secretary/workbench/views/forms/icla.js.rb b/www/secretary/workbench/views/forms/icla.js.rb
index 3f53242..574d8bf 100644
--- a/www/secretary/workbench/views/forms/icla.js.rb
+++ b/www/secretary/workbench/views/forms/icla.js.rb
@@ -125,13 +125,16 @@ class ICLA < React
     project = document.querySelector("select[name=project]")
     votelink = document.querySelector("input[name=votelink]")
 
+    valid &&= project.validity.valid
+
     # project votelink are only required with valid users; only validate
     # votelink if the user is valid
     if user.validity.valid and user.value.length > 0
       project.required = votelink.required = true
       valid &= votelink.validity.valid
     else
-      project.required = votelink.required = false
+      votelink.required = false
+      project.required = (user.value.length > 0)
     end
 
     $file.disabled = !valid or @filed or @submitted

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.