Merge pull request #6292 from hstastna/Replication_subscribtion_Save/…

…Discard_btns Disable Save/Reset buttons after discarding changes for Subscription
ManageIQ · Dec 5, 2019 · 32466f6 · 32466f6
2 parents 082a476 + afba162
commit 32466f6
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/app/assets/javascripts/controllers/ops/pglogical_replication_form_controller.js b/app/assets/javascripts/controllers/ops/pglogical_replication_form_controller.js
@@ -149,6 +149,11 @@ ManageIQ.angular.app.controller('pglogicalReplicationFormController', ['$http',
     }
     $scope.pglogicalReplicationModel.addEnabled = false;
     $scope.pglogicalReplicationModel.updateEnabled = false;
+
+    // check if subscriptions changed
+    if (angular.equals($scope.pglogicalReplicationModel.subscriptions, $scope.modelCopy.subscriptions)) {
+      $scope.angularForm.$setPristine();
+    }
   };
 
   // delete an existing subscription
@@ -174,15 +179,21 @@ ManageIQ.angular.app.controller('pglogicalReplicationFormController', ['$http',
       $scope.pglogicalReplicationModel.port       = '';
       $scope.pglogicalReplicationModel.addEnabled = false;
     } else {
-      var original_values = $scope.modelCopy.subscriptions[idx];
       var subscription    = $scope.pglogicalReplicationModel.subscriptions[idx];
+      var original_values = subscription;
+
+      if ($scope.modelCopy.subscriptions[idx]) {
+        original_values = $scope.modelCopy.subscriptions[idx];
+      }
+
       $scope.pglogicalReplicationModel.updateEnabled = false;
       subscription.dbname   = original_values.dbname;
       subscription.host     = original_values.host;
       subscription.user     = original_values.user;
       subscription.password = original_values.password;
       subscription.port     = original_values.port;
     }
+    $scope.angularForm.$setPristine();
   };
 
   // validate subscription, all required fields should have data