diff options
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/compose.js | 2 | ||||
| -rw-r--r-- | app/views/settings/flavours/show.html.haml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js index f341977b7..ae1276685 100644 --- a/app/javascript/flavours/glitch/reducers/compose.js +++ b/app/javascript/flavours/glitch/reducers/compose.js @@ -134,7 +134,7 @@ function continueThread (state, status) { 'advanced_options', map => map.merge(new ImmutableMap({ do_not_federate: /👁\ufe0f?\u200b?(?:<\/p>)?$/.test(status.content) })) ); - map.set('privacy', privacyPreference(status.visibility, state.get('default_privacy'))); + map.set('privacy', status.visibility); map.set('sensitive', false); map.update('media_attachments', list => list.clear()); map.set('idempotencyKey', uuid()); diff --git a/app/views/settings/flavours/show.html.haml b/app/views/settings/flavours/show.html.haml index 43c037737..a5126d9c5 100644 --- a/app/views/settings/flavours/show.html.haml +++ b/app/views/settings/flavours/show.html.haml @@ -12,8 +12,9 @@ %hr/ - .fields-group - = f.input :setting_skin, collection: Themes.instance.skins_for(@selected), label_method: lambda { |skin| I18n.t("skins.#{@selected}.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false + - if Themes.instance.skins_for(@selected).length > 1 + .fields-group + = f.input :setting_skin, collection: Themes.instance.skins_for(@selected), label_method: lambda { |skin| I18n.t("skins.#{@selected}.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false .actions = f.button :button, t('generic.use_this'), type: :submit |