FIX: revert bug

lis2 · lis2 · commit 35df5ebfab8c · 2025-08-15T15:13:38.000+08:00
diff --git a/app/assets/javascripts/admin/addon/components/admin-config-areas/color-palettes.gjs b/app/assets/javascripts/admin/addon/components/admin-config-areas/color-palettes.gjs
@@ -35,17 +35,20 @@ export default class AdminConfigAreasColorPalettes extends Component {
   @action
   async newColorPaletteWithBase(baseKey) {
     let base;
+    let base_scheme_id;
     if (baseKey && /^\d+$/.test(baseKey)) {
       base = this.allColorPalettes.findBy("id", baseKey);
+      base_scheme_id = -1;
     } else {
       base = this.allColorPalettes.find(
         (palette) => palette.base_scheme_id === baseKey
       );
+      base_scheme_id = base.get("base_scheme_id");
     }
     const newPalette = base.copy();
     newPalette.setProperties({
       name: i18n("admin.customize.colors.new_name"),
-      base_scheme_id: base.get("base_scheme_id"),
+      base_scheme_id,
     });
     await newPalette.save();
     await this.router.refresh();
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js
@@ -178,16 +178,23 @@ export default class AdminCustomizeColorsController extends Controller {
   @action
   newColorSchemeWithBase(baseKey) {
     let base;
+    let base_scheme_id;
     if (baseKey && /^\d+$/.test(baseKey)) {
       base = this.model.content.findBy("id", baseKey);
+      base_scheme_id = -1;
     } else {
       base = this.allBaseColorSchemes.findBy("base_scheme_id", baseKey);
+      base_scheme_id = base.get("base_scheme_id");
     }
 
     const newColorScheme = base.copy();
     newColorScheme.setProperties({
       name: i18n("admin.customize.colors.new_name"),
-      base_scheme_id: base.get("base_scheme_id"),
+      base_scheme_id,
+    });
+    newColorScheme.colors = newColorScheme.colors.map((color) => {
+      color.default_hex = null;
+      return color;
     });
     newColorScheme.save().then(() => {
       this.model.pushObject(newColorScheme);
diff --git a/app/assets/javascripts/admin/addon/models/color-scheme-color.js b/app/assets/javascripts/admin/addon/models/color-scheme-color.js
@@ -56,6 +56,9 @@ export default class ColorSchemeColor extends EmberObject {
   // Whether the saved value is different than Discourse's default color scheme.
   @discourseComputed("default_hex", "hex")
   savedIsOverriden(defaultHex) {
+    if (!defaultHex) {
+      return false;
+    }
     return this.originals.hex !== defaultHex;
   }
 
diff --git a/app/serializers/color_scheme_color_serializer.rb b/app/serializers/color_scheme_color_serializer.rb
@@ -12,11 +12,12 @@ def dark_hex
   end
 
   def default_hex
-    if object.color_scheme
-      object.color_scheme.base_colors[object.name]
-    else
-      # it is a base color so it is already default
+    # return the hex value of the color when based on custom scheme
+    # or it is already a base color
+    if !object.color_scheme || object.color_scheme.base_scheme_id == "-1"
       object.hex
+    else
+      object.color_scheme.base_colors[object.name]
     end
   end
 

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ export default class ColorSchemeColor extends EmberObject {`
`56`	`56`	`// Whether the saved value is different than Discourse's default color scheme.`
`57`	`57`	`@discourseComputed("default_hex", "hex")`
`58`	`58`	`savedIsOverriden(defaultHex) {`
	`59`	`+ if (!defaultHex) {`
	`60`	`+ return false;`
	`61`	`+ }`
`59`	`62`	`return this.originals.hex !== defaultHex;`
`60`	`63`	`}`
`61`	`64`