Add admin setting to auto-approve hashtags (#12122)

Change inaccurate labels on other admin settings
2019-10-09 00:30:15 +02:00
parent 19cdc62765
commit c8bcf5cbfd
5 changed files with 17 additions and 8 deletions
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -30,6 +30,7 @@ class Form::AdminSettings
    mascot
    spam_check_enabled
    trends
+    trendable_by_default
    show_domain_blocks
    show_domain_blocks_rationale
    noindex
@@ -46,6 +47,7 @@ class Form::AdminSettings
    profile_directory
    spam_check_enabled
    trends
+    trendable_by_default
    noindex
  ).freeze

--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -76,7 +76,7 @@ class Tag < ApplicationRecord
  alias listable? listable

  def trendable
-    boolean_with_default('trendable', false)
+    boolean_with_default('trendable', Setting.trendable_by_default)
  end

  alias trendable? trendable