diff --git a/app/views/shared/_create_account_form.html.erb b/app/views/shared/_create_account_form.html.erb index 1c10cb6..60febb9 100644 --- a/app/views/shared/_create_account_form.html.erb +++ b/app/views/shared/_create_account_form.html.erb @@ -15,7 +15,7 @@
<%= render partial: "shared/my_org", locals: {f: f, default_org: @default_org, - orgs: Org.where("is_other IS NULL").order("sort_name ASC, name ASC"), + orgs: Org.where(is_other: false).order("sort_name ASC, name ASC"), allow_other_orgs: true, required: false} %>
diff --git a/lib/assets/javascripts/views/shared/create_account_form.js b/lib/assets/javascripts/views/shared/create_account_form.js index fe57717..8ef4403 100644 --- a/lib/assets/javascripts/views/shared/create_account_form.js +++ b/lib/assets/javascripts/views/shared/create_account_form.js @@ -1,7 +1,6 @@ import ariatiseForm from '../../utils/ariatiseForm'; import { togglisePasswords } from '../../utils/passwordHelper'; -import validateOrgSelection from '../shared/my_org'; -import { isValidText } from '../../utils/isValidInputType'; +import { validateOrgSelection } from '../shared/my_org'; $(() => { const options = { selector: '#create-account-form' }; diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index dd52bb6..bb0659a 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake @@ -15,7 +15,7 @@ # Ensure all dependencies are installed system("npm install") # Run the webpack command via npm - system("npm run bundle -- #{webpack_options.join(" ")}") + system("npm run bundle -- #{webpack_options.join(" ")}") or exit() end end end