Merge pull request #544 from DigitalCurationCentre/kmcgre/CDL-MVP

Make organisation mandatory for register form #518

Author: briri

app/views/shared/_register_form.html.erb

@@ -24,7 +24,7 @@
 
 
     <div class="form-input">
-      <%= f.label _('Organisation'), for: :user_org_name %>
+      <%= f.label _('Organisation'), for: :user_org_name, class: 'required' %>
       <%= render partial: "shared/accessible_combobox", 
                  locals: {name: 'user[org_name]',
                           id: 'user_org_name',

lib/assets/javascripts/views/shared/register_form.js

@@ -6,7 +6,7 @@ $(document).ready(function(){
     });
 
     // See if we should enable the submit button when a required input changes
-    $("form.register-form input[class*='required']").on('change keyup', function(){
+    $("form.register-form input[class*='required'], #other-org-name, #user_org_name").on('change keyup', function(){
       toggleRegisterSubmit();
     });
 
@@ -71,7 +71,8 @@ $(document).ready(function(){
                       validateEmail($("form.register-form #user_email").val()) != '' || 
                       validateEmail($("form.register-form #user_recovery_email").val()) != '' || 
                       !$("form.register-form #user_accept_terms").prop('checked') ||
-                      $("form.register-form #user_email").val() === $("form.register-form #user_recovery_email").val());
+                      $("form.register-form #user_email").val() === $("form.register-form #user_recovery_email").val() ||
+                      ($("form.register-form #user_org_name").val().trim().length <=0 && $("form.register-form #user_other_organisation").val().trim().length <= 0));
       $("form.register-form #register-button").attr('aria-disabled', disabled);
     }
   }