Browse Source

add admin setting for default search engine indexing (fix #11750) (#11804)

master
Tao Bror Bojlén 5 years ago
committed by Eugen Rochko
parent
commit
4fe127664b
5 changed files with 10 additions and 0 deletions
  1. +1
    -0
      app/lib/settings/scoped_settings.rb
  2. +2
    -0
      app/models/form/admin_settings.rb
  3. +3
    -0
      app/views/admin/settings/edit.html.haml
  4. +3
    -0
      config/locales/en.yml
  5. +1
    -0
      spec/controllers/application_controller_spec.rb

+ 1
- 0
app/lib/settings/scoped_settings.rb View File

@ -4,6 +4,7 @@ module Settings
class ScopedSettings
DEFAULTING_TO_UNSCOPED = %w(
theme
noindex
).freeze
def initialize(object)

+ 2
- 0
app/models/form/admin_settings.rb View File

@ -32,6 +32,7 @@ class Form::AdminSettings
trends
show_domain_blocks
show_domain_blocks_rationale
noindex
).freeze
BOOLEAN_KEYS = %i(
@ -45,6 +46,7 @@ class Form::AdminSettings
profile_directory
spam_check_enabled
trends
noindex
).freeze
UPLOAD_KEYS = %i(

+ 3
- 0
app/views/admin/settings/edit.html.haml View File

@ -71,6 +71,9 @@
.fields-group
= f.input :trends, as: :boolean, wrapper: :with_label, label: t('admin.settings.trends.title'), hint: t('admin.settings.trends.desc_html')
.fields-group
= f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')
.fields-group
= f.input :spam_check_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.spam_check_enabled.title'), hint: t('admin.settings.spam_check_enabled.desc_html')

+ 3
- 0
config/locales/en.yml View File

@ -427,6 +427,9 @@ en:
custom_css:
desc_html: Modify the look with CSS loaded on every page
title: Custom CSS
default_noindex:
desc_html: Affects all users who have not changed this setting themselves
title: Opt users out of search engine indexing by default
domain_blocks:
all: To everyone
disabled: To no one

+ 1
- 0
spec/controllers/application_controller_spec.rb View File

@ -110,6 +110,7 @@ describe ApplicationController, type: :controller do
sign_in current_user
allow(Setting).to receive(:[]).with('theme').and_return 'contrast'
allow(Setting).to receive(:[]).with('noindex').and_return false
expect(controller.view_context.current_theme).to eq 'contrast'
end

Loading…
Cancel
Save