diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-17 22:04:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 22:04:40 +0200 |
| commit | 72d7d3003b1e21ef8a6f5112f1e8cb32c72e8992 (patch) | |
| tree | bc2519f2910d3db389a7257c9583a556575d1c7d | |
| parent | ddd30f331c7a2af38176d72d9ce2265068984bed (diff) | |
Do not show "limited" visibility in default visibility preference (#8999)
* Do not show "limited" visibility in default visibility preference Fix regression from #8950 * Fix code style issue
| -rw-r--r-- | app/models/status.rb | 4 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index b18cb56b2..bcb7dd373 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -238,6 +238,10 @@ class Status < ApplicationRecord left_outer_joins(:status_stat).select('statuses.id, greatest(statuses.updated_at, status_stats.updated_at) AS updated_at') end + def selectable_visibilities + visibilities.keys - %w(direct limited) + end + def in_chosen_languages(account) where(language: nil).or where(language: account.chosen_languages) end diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index d889702fe..ecb789f93 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -22,7 +22,7 @@ %hr#settings_publishing/ .fields-group - = f.input :setting_default_privacy, collection: Status.visibilities.keys - ['direct'], wrapper: :with_floating_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' + = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_floating_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label |