Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: showing loader when there is no properties & Register form bug not conserving values after errors #405

Merged
merged 5 commits into from
Dec 8, 2023
Merged

Fix: showing loader when there is no properties & Register form bug not conserving values after errors #405

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c69cf2
Fix locales EN and FR with a bunch of changes (#391)
jonquet Nov 30, 2023
c2dc795
fix bug of the loader when there is no properties
SirineMhedhbi Dec 7, 2023
3e41db7
fix bug of conserve values (firstname and lastname)
SirineMhedhbi Dec 7, 2023
f4b588b
Merge branch 'development' into fix/bug-of-loader-when-there-is-no-pr…
syphax-bouazzouni Dec 7, 2023
4873776
add the if of container to hide the loader
SirineMhedhbi Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/assets/javascripts/bp_property_tree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@
} else {
ROOT.html("No properties exist for this ontology");
ROOT.css("font-size", "14px").css("margin", "5px");
jQuery(".spinner-border").hide()
syphax-bouazzouni marked this conversation as resolved.
Show resolved Hide resolved
}

if (typeof OPTIONS.onInit === 'function') { OPTIONS.onInit(); }
Expand Down
4 changes: 2 additions & 2 deletions app/views/users/_form.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"} *
Expand Down
2 changes: 2 additions & 0 deletions config/bioportal_config_env.rb.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ $FOOTER_LINKS = {
}
}

$NOT_DOWNLOADABLE = {}

$UI_THEME = ENV['UI_THEME'] || 'ontoportal'

$HOSTNAME = ENV['API_URL']
Expand Down
Loading