Fix: showing loader when there is no properties & Register form bug n…

…ot conserving values after errors (#405) * Fix locales EN and FR with a bunch of changes (#391) * Fixing fr and en locales (step 1) * Fixing fr and en locales (step 2) * Fixing fr and en locales (step 3) * fix bug of the loader when there is no properties * fix bug of conserve values (firstname and lastname) * add the id of container to hide the loader --------- Co-authored-by: Clement Jonquet <[email protected]> Co-authored-by: Syphax bouazzouni <[email protected]>
ontoportal-lirmm · Dec 8, 2023 · 388cbab · 388cbab
1 parent a443071
commit 388cbab
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app/assets/javascripts/bp_property_tree.js b/app/assets/javascripts/bp_property_tree.js
@@ -301,6 +301,7 @@
           } else {
             ROOT.html("No properties exist for this ontology");
             ROOT.css("font-size", "14px").css("margin", "5px");
+            jQuery("#prop_contents .spinner-border").hide()
           }
 
           if (typeof OPTIONS.onInit === 'function') { OPTIONS.onInit(); }

diff --git a/app/views/users/_form.html.haml b/app/views/users/_form.html.haml
@@ -13,12 +13,12 @@
         %p.register-input-title
           = t('register.first_name')
           %font{:color => "red"} *
-        = text_field :user, :firstName, value: @user.firstname, class: "register-input-short"
+        = text_field :user, :firstName, value: @user.firstName, class: "register-input-short"
       %div
         %p.register-input-title
           = t('register.last_name')
           %font{:color => "red"} *
-        = text_field :user, :lastName, value: @user.lastname, class: "register-input-short"
+        = text_field :user, :lastName, value: @user.lastName, class: "register-input-short"
     %p.register-input-title
       = t('register.username')
       %font{:color => "red"} *

diff --git a/config/bioportal_config_env.rb.sample b/config/bioportal_config_env.rb.sample
@@ -211,7 +211,6 @@ $FOOTER_LINKS = {
 
 $NOT_DOWNLOADABLE = {}
 
-
 $UI_THEME = ENV['UI_THEME'] || 'ontoportal'
 $HOSTNAME = ENV['API_URL']
 if $HOSTNAME

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -203,6 +203,7 @@ en:
       about_us: About Us
       projects: D2KAB
       team: Team   
+
   login:
     enter_email: Enter your username
     enter_password: Enter your password