The personal finance app for everyone
Enable all currencies for preferences (#722)
Zach Gollwitzer79789bd69630
diff --git a/app/helpers/application_form_builder.rb b/app/helpers/application_form_builder.rbindex 61366cc9..0bdf3fab 100644--- a/app/helpers/application_form_builder.rb+++ b/app/helpers/application_form_builder.rb@@ -49,10 +49,10 @@ class ApplicationFormBuilder < ActionView::Helpers::FormBuilder@template.form_field_tag data: { controller: "money-field" } do(label(method, *label_args(options)).to_s if options[:label]) +- @template.tag.div(class: "flex items-center") do- number_field(money_amount_method, merged_options.except(:label)) +- grouped_select(money_currency_method, grouped_options, { selected: selected_currency, disabled: readonly_currency }, class: "ml-auto form-field__input w-fit pr-8", data: { "money-field-target" => "currency", action: "change->money-field#handleCurrencyChange" })- end+ @template.tag.div(class: "flex items-center") do+ number_field(money_amount_method, merged_options.except(:label)) ++ grouped_select(money_currency_method, grouped_options, { selected: selected_currency, disabled: readonly_currency }, class: "ml-auto form-field__input w-fit pr-8", data: { "money-field-target" => "currency", action: "change->money-field#handleCurrencyChange" })+ endendend@@ -74,6 +74,20 @@ class ApplicationFormBuilder < ActionView::Helpers::FormBuilderendend+ def currency_select(method, options = {}, html_options = {})+ default_options = { class: "form-field__input" }+ merged_options = default_options.merge(html_options)++ choices = currency_options_for_select++ return @template.grouped_collection_select(@object_name, method, choices, :last, :first, :last, :first, options, merged_options) unless options[:label]++ @template.form_field_tag do+ label(method, *label_args(options)) ++ @template.grouped_collection_select(@object_name, method, choices, :last, :first, :last, :first, options, merged_options.except(:label))+ end+ end+def select(method, choices, options = {}, html_options = {})default_options = { class: "form-field__input" }merged_options = default_options.merge(html_options)@@ -82,7 +96,7 @@ class ApplicationFormBuilder < ActionView::Helpers::FormBuilder@template.form_field_tag dolabel(method, *label_args(options)) +- super(method, choices, options, merged_options.except(:label))+ super(method, choices, options, merged_options.except(:label))endend@@ -94,7 +108,7 @@ class ApplicationFormBuilder < ActionView::Helpers::FormBuilder@template.form_field_tag dolabel(method, *label_args(options)) +- super(method, collection, value_method, text_method, options, merged_options.except(:label))+ super(method, collection, value_method, text_method, options, merged_options.except(:label))endend@@ -107,27 +121,27 @@ class ApplicationFormBuilder < ActionView::Helpers::FormBuilderprivate- def currency_options_for_select- popular_currencies = Money::Currency.popular.map { |currency| [ currency.iso_code, currency.iso_code ] }- all_currencies = Money::Currency.all_instances.map { |currency| [ currency.iso_code, currency.iso_code ] }- all_other_currencies = all_currencies.reject { |c| popular_currencies.map(&:last).include?(c.last) }.sort_by(&:last)+ def currency_options_for_select+ popular_currencies = Money::Currency.popular.map { |currency| [ currency.iso_code, currency.iso_code ] }+ all_currencies = Money::Currency.all_instances.map { |currency| [ currency.iso_code, currency.iso_code ] }+ all_other_currencies = all_currencies.reject { |c| popular_currencies.map(&:last).include?(c.last) }.sort_by(&:last)- {- I18n.t("accounts.new.currency.popular") => popular_currencies,- I18n.t("accounts.new.currency.all_others") => all_other_currencies- }- end+ {+ I18n.t("accounts.new.currency.popular") => popular_currencies,+ I18n.t("accounts.new.currency.all_others") => all_other_currencies+ }+ end- def label_args(options)- case options[:label]- when Array- options[:label]- when String- [ options[:label], { class: "form-field__label" } ]- when Hash- [ nil, options[:label] ]- else- [ nil, { class: "form-field__label" } ]+ def label_args(options)+ case options[:label]+ when Array+ options[:label]+ when String+ [ options[:label], { class: "form-field__label" } ]+ when Hash+ [ nil, options[:label] ]+ else+ [ nil, { class: "form-field__label" } ]+ endend- endenddiff --git a/app/views/settings/preferences/show.html.erb b/app/views/settings/preferences/show.html.erbindex b32fd568..734190e7 100644--- a/app/views/settings/preferences/show.html.erb+++ b/app/views/settings/preferences/show.html.erb@@ -7,7 +7,7 @@<div><%= form_with model: Current.user, url: settings_preferences_path, html: { class: "space-y-4", data: { controller: "auto-submit-form" } } do |form| %><%= form.fields_for :family_attributes do |family_fields| %>- <%= family_fields.select :currency, options_for_select(Money::Currency.popular.map { |currency| ["#{currency.iso_code} (#{currency.name})", currency.iso_code] }, selected: Current.family.currency), { label: "Currency" }, { data: { auto_submit_form_target: "auto" } } %>+ <%= family_fields.currency_select :currency, { selected: Current.family.currency, label: "Currency" }, { data: { auto_submit_form_target: "auto" } } %><% end %><% end %></div>