This commit is contained in:
		
				
					committed by
					
						 Eugen Rochko
						Eugen Rochko
					
				
			
			
				
	
			
			
			
						parent
						
							4faaa5b25e
						
					
				
				
					commit
					4fe127664b
				
			| @@ -4,6 +4,7 @@ module Settings | ||||
|   class ScopedSettings | ||||
|     DEFAULTING_TO_UNSCOPED = %w( | ||||
|       theme | ||||
|       noindex | ||||
|     ).freeze | ||||
|  | ||||
|     def initialize(object) | ||||
|   | ||||
| @@ -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( | ||||
|   | ||||
| @@ -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') | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user