From 16c64014b209500a629b3f91441c579baf19a5de Mon Sep 17 00:00:00 2001
From: "c.lamboo" <casperlamboo@gmail.com>
Date: Wed, 4 Jan 2023 13:17:48 +0100
Subject: [PATCH] Resolve formula in Keep or Discard dialog

CURA-10111
---
 cura/Machines/Models/UserChangesModel.py      | 14 ++++++----
 .../DiscardOrKeepProfileChangesDialog.qml     | 28 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/cura/Machines/Models/UserChangesModel.py b/cura/Machines/Models/UserChangesModel.py
index 171e910dd8..daea45eb52 100644
--- a/cura/Machines/Models/UserChangesModel.py
+++ b/cura/Machines/Models/UserChangesModel.py
@@ -118,12 +118,14 @@ class UserChangesModel(ListModel):
                     if original_value is not None:
                         break
 
-                item_to_add = {"key": setting_key,
-                               "label": label,
-                               "user_value": str(user_changes.getProperty(setting_key, "value")),
-                               "original_value": str(original_value),
-                               "extruder": "",
-                               "category": category_label}
+                item_to_add = {
+                    "key": setting_key,
+                    "label": label,
+                    "user_value": str(user_changes.getProperty(setting_key, "value", default_value_resolve_context)),
+                    "original_value": str(original_value),
+                    "extruder": "",
+                    "category": category_label,
+                }
 
                 if stack != global_stack:
                     item_to_add["extruder"] = stack.getName()
diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
index 8dbe18ccff..c2ec1ed308 100644
--- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
+++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
@@ -107,7 +107,7 @@ UM.Dialog
     [
         Cura.ComboBox
         {
-            visible: buttonState == DiscardOrKeepProfileChangesDialog.ButtonsType.DiscardOrKeep
+            visible: buttonState === DiscardOrKeepProfileChangesDialog.ButtonsType.DiscardOrKeep
 
             implicitHeight: UM.Theme.getSize("combobox").height
             implicitWidth: UM.Theme.getSize("combobox").width
@@ -128,20 +128,22 @@ UM.Dialog
 
             onActivated:
             {
-                var code = model.get(index).code;
+                const code = model.get(index).code;
                 UM.Preferences.setValue("cura/choice_on_profile_override", code);
 
-                if (code == "always_keep") {
-                    keepButton.enabled = true;
-                    discardButton.enabled = false;
-                }
-                else if (code == "always_discard") {
-                    keepButton.enabled = false;
-                    discardButton.enabled = true;
-                }
-                else {
-                    keepButton.enabled = true;
-                    discardButton.enabled = true;
+                switch (code) {
+                    case "always_keep":
+                        keepButton.enabled = true;
+                        discardButton.enabled = false;
+                        break;
+                    case "always_discard":
+                        keepButton.enabled = false;
+                        discardButton.enabled = true;
+                        break;
+                    default:
+                        keepButton.enabled = true;
+                        discardButton.enabled = true;
+                        break;
                 }
             }
         }