Correctly merge env edits after background upates

openshift · Oct 31, 2017 · 7e266f0 · 7e266f0
1 parent 685f44d
commit 7e266f0
Show file tree

Hide file tree

Showing 2 changed files with 125 additions and 125 deletions.
diff --git a/app/scripts/directives/editEnvironmentVariables.js b/app/scripts/directives/editEnvironmentVariables.js
@@ -52,7 +52,7 @@
       // variables. If not, merge the environment edits into the updated
       // deployment config object.
       if (EnvironmentService.isEnvironmentEqual(currentValue, previousValue)) {
-        ctrl.updatedObject = EnvironmentService.mergeEdits(currentValue, previousValue);
+        ctrl.updatedObject = EnvironmentService.mergeEdits(ctrl.updatedObject, currentValue);
         return;
       }