Fix disappearing parameters after webhook edit

tcplugins · Sep 19, 2020 · d58183f · d58183f
1 parent 6c70dce
commit d58183f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/js/editWebhook.js b/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/js/editWebhook.js
@@ -98,6 +98,7 @@ WebHooksPlugin = {
 					    dialog.ajaxError(thing.textContent);
 				    });
     				if (! isErrored) {
+    					let refreshDone = false;
     					dialog.close();
 
     					// Animate the removal of the webhook table row.
@@ -107,8 +108,11 @@ WebHooksPlugin = {
     			            .wrapInner('<div />')	// Wrap the content in a div, so that the height can be animated.
     			            .children()
     			            .slideUp(function() {
-    			            	$j(this).closest('tr').remove();
-    			            	$('systemParams').updateContainer();
+    			            	if (!refreshDone) {
+    			            		$j(this).closest('tr').remove();
+    			            		$('systemParams').updateContainer();
+    			            		refreshDone = true;
+    			            	}
     			            });
     				}
     			},

diff --git a/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/js/editWebhookParameter.js b/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/js/editWebhookParameter.js
@@ -347,6 +347,7 @@ WebHooksPlugin.Parameters = {
 					'Accept' : 'application/json'
 				},
 				success: function (response) {
+					let refreshDone = false;
 					dialog.close();
 					// Animate the removal of the webhook parameter table row.
 					// Then do the div refresh after the row is gone.
@@ -356,8 +357,11 @@ WebHooksPlugin.Parameters = {
 			            .wrapInner('<div />')	// Wrap the content in a div, so that the height can be animated.
 			            .children()
 			            .slideUp(function() {
-			            	$j(this).closest('tr').remove();
-			            	$("projectWebhookParametersContainer").refresh();
+			            	if (!refreshDone) {
+			            		$j(this).closest('tr').remove();
+			            		$("projectWebhookParametersContainer").refresh();
+			            		refreshDone = true;
+			            	}
 			            });
 				},
 				error: function (response) {

diff --git a/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/webhookEdit.jsp b/tcwebhooks-web-ui/src/main/resources/buildServerResources/WebHook/webhookEdit.jsp
@@ -277,7 +277,7 @@
          	</c:otherwise>  
 		</c:choose>  	        
 	          		ProjectBuilds = data;
-	          		$j('.webHookRow').remove();
+	          		$j('#webHookTable .webHookRow').remove();
 	          		addWebHooksFromJsonCallback();
 				});
 	        }