more javascript twist

seek4science · Jan 14, 2025 · 81dba73 · 81dba73
1 parent aff30dc
commit 81dba73
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/app/assets/javascripts/ror/institution-typeahead.js b/app/assets/javascripts/ror/institution-typeahead.js
@@ -136,6 +136,13 @@ $j(document).ready(function () {
         fetchRorData($j('#institution_ror_id').val());
     });
 
+    // if the institution title is not selected from the local list or ROR, but entered manually by user
+    $j('#institution_name').on('change', function () {
+        const inputValue = $j(this).val();
+        $j('#institution_title').val(inputValue);
+        checkSubmitButtonEnabled();
+    });
+
 
     $j('#combined_typeahead .typeahead').typeahead(
         {

diff --git a/app/views/institutions/_select_or_define.html.erb b/app/views/institutions/_select_or_define.html.erb
@@ -24,7 +24,7 @@
   </div>
 
   <label class="control-label">Type the name of the <%= t('institution'.downcase) %> </label><span class="required">*</span>
-  <%= text_field_tag :search, nil, placeholder: "Search...", class: "form-control typeahead" %>
+  <%= text_field_tag :institution_name, nil, placeholder: "Search...", class: "form-control typeahead" %>
   <small id="new_institution_reminder" style="display: none; color:darkseagreen; ">
     This institution is not in <%= Seek::Config.instance_name %>. You will create this new institution along with your project.
   </small>

diff --git a/app/views/projects/guided_create.html.erb b/app/views/projects/guided_create.html.erb
@@ -53,10 +53,10 @@
 
     function checkSubmitButtonEnabled() {
         var progEnabled = <%= Seek::ProjectFormProgrammeOptions.show_programme_box? %>;
-        var enabled = $j('#institution_title').val()
-            && !progEnabled || ($j('#programme_id').val() || $j('input#programme_title').val())
+        var enabled = $j('input#institution_name').val()
             && $j('input#project_title').val()
-            && $j('input#institution_title').val();
+            && $j('input#institution_title').val()
+            && !progEnabled  || ($j('#programme_id').val() || $j('input#programme_title').val());
         $j('#submit-button').prop('disabled',!enabled);
     }
 
@@ -104,7 +104,7 @@
           checkSubmitButtonEnabled();
        });
 
-       $j('input#project_title').on('input',function() {
+       $j('input#project_title').on('change',function() {
             checkSubmitButtonEnabled();
        });