From 8d69944b4ecb4b32672641dda8fd927dbe2354e8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 2 Nov 2019 13:54:41 +0100
Subject: [PATCH] FIX: update action should be in setting-component mixin
 (#8287)

This was causing an exception on some component (eg: value-list in a theme-component setting) which couldn't find an action named update.
---
 .../admin/components/site-setting.js.es6      | 59 -------------------
 .../admin/mixins/setting-component.js.es6     | 57 ++++++++++++++++++
 2 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 90c886c3a65..cd768407ff1 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -2,8 +2,6 @@ import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
 import SiteSetting from "admin/models/site-setting";
 import SettingComponent from "admin/mixins/setting-component";
-import showModal from "discourse/lib/show-modal";
-import AboutRoute from "discourse/routes/about";
 
 export default Component.extend(BufferedContent, SettingComponent, {
   updateExistingUsers: null,
@@ -13,62 +11,5 @@ export default Component.extend(BufferedContent, SettingComponent, {
     return SiteSetting.update(setting.get("setting"), setting.get("value"), {
       updateExistingUsers: this.updateExistingUsers
     });
-  },
-
-  actions: {
-    update() {
-      const defaultUserPreferences = [
-        "default_email_digest_frequency",
-        "default_include_tl0_in_digests",
-        "default_email_level",
-        "default_email_messages_level",
-        "default_email_mailing_list_mode",
-        "default_email_mailing_list_mode_frequency",
-        "disable_mailing_list_mode",
-        "default_email_previous_replies",
-        "default_email_in_reply_to",
-        "default_other_new_topic_duration_minutes",
-        "default_other_auto_track_topics_after_msecs",
-        "default_other_notification_level_when_replying",
-        "default_other_external_links_in_new_tab",
-        "default_other_enable_quoting",
-        "default_other_enable_defer",
-        "default_other_dynamic_favicon",
-        "default_other_like_notification_frequency",
-        "default_topics_automatic_unpin",
-        "default_categories_watching",
-        "default_categories_tracking",
-        "default_categories_muted",
-        "default_categories_watching_first_post",
-        "default_tags_watching",
-        "default_tags_tracking",
-        "default_tags_muted",
-        "default_tags_watching_first_post",
-        "default_text_size",
-        "default_title_count_mode"
-      ];
-      const key = this.buffered.get("setting");
-
-      if (defaultUserPreferences.includes(key)) {
-        AboutRoute.create()
-          .model()
-          .then(result => {
-            const controller = showModal("site-setting-default-categories", {
-              model: {
-                count: result.stats.user_count,
-                key: key.replace(/_/g, " ")
-              },
-              admin: true
-            });
-
-            controller.set("onClose", () => {
-              this.updateExistingUsers = controller.updateExistingUsers;
-              this.send("save");
-            });
-          });
-      } else {
-        this.send("save");
-      }
-    }
   }
 });
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 3a7ab2e2c46..a8040a63ca3 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -3,6 +3,8 @@ import computed from "ember-addons/ember-computed-decorators";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
 import { on } from "@ember/object/evented";
 import Mixin from "@ember/object/mixin";
+import showModal from "discourse/lib/show-modal";
+import AboutRoute from "discourse/routes/about";
 
 const CUSTOM_TYPES = [
   "bool",
@@ -114,6 +116,61 @@ export default Mixin.create({
   },
 
   actions: {
+    update() {
+      const defaultUserPreferences = [
+        "default_email_digest_frequency",
+        "default_include_tl0_in_digests",
+        "default_email_level",
+        "default_email_messages_level",
+        "default_email_mailing_list_mode",
+        "default_email_mailing_list_mode_frequency",
+        "disable_mailing_list_mode",
+        "default_email_previous_replies",
+        "default_email_in_reply_to",
+        "default_other_new_topic_duration_minutes",
+        "default_other_auto_track_topics_after_msecs",
+        "default_other_notification_level_when_replying",
+        "default_other_external_links_in_new_tab",
+        "default_other_enable_quoting",
+        "default_other_enable_defer",
+        "default_other_dynamic_favicon",
+        "default_other_like_notification_frequency",
+        "default_topics_automatic_unpin",
+        "default_categories_watching",
+        "default_categories_tracking",
+        "default_categories_muted",
+        "default_categories_watching_first_post",
+        "default_tags_watching",
+        "default_tags_tracking",
+        "default_tags_muted",
+        "default_tags_watching_first_post",
+        "default_text_size",
+        "default_title_count_mode"
+      ];
+      const key = this.buffered.get("setting");
+
+      if (defaultUserPreferences.includes(key)) {
+        AboutRoute.create()
+          .model()
+          .then(result => {
+            const controller = showModal("site-setting-default-categories", {
+              model: {
+                count: result.stats.user_count,
+                key: key.replace(/_/g, " ")
+              },
+              admin: true
+            });
+
+            controller.set("onClose", () => {
+              this.updateExistingUsers = controller.updateExistingUsers;
+              this.send("save");
+            });
+          });
+      } else {
+        this.send("save");
+      }
+    },
+
     save() {
       this._save()
         .then(() => {