ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
rebase/4.0.0rc2
Eugen Rochko 2018-10-17 22:04:40 +02:00 committed by GitHub
parent ddd30f331c
commit 72d7d3003b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/status.rb
View File

@ -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') left_outer_joins(:status_stat).select('statuses.id, greatest(statuses.updated_at, status_stats.updated_at) AS updated_at')
end end
def selectable_visibilities
visibilities.keys - %w(direct limited)
end
def in_chosen_languages(account) def in_chosen_languages(account)
where(language: nil).or where(language: account.chosen_languages) where(language: nil).or where(language: account.chosen_languages)
end end

2
app/views/settings/preferences/show.html.haml
View File

@ -22,7 +22,7 @@
%hr#settings_publishing/ %hr#settings_publishing/
.fields-group .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 = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label