* Fix bug #22587.

2022-05-18 03:15:15 +00:00
parent cc83dcc446
commit 9c336a223e
1 changed files with 8 additions and 5 deletions
@@ -25,14 +25,17 @@ function getConflictStories(planID, branch)
 {
    $.get(createLink('productplan', 'ajaxGetConflictStory', 'planID=' + planID + '&newBranch=' + branch), function(conflictStories)
    {
-        var result = confirm(conflictStories) ? true : false;
-        if(conflictStories != '' && !result)
+        if(conflictStories != '')
        {
-            $('#branch').val(oldBranch[planID]);
-            $('#branch').trigger("chosen:updated");
+            var result = confirm(conflictStories) ? true : false;
+            if(!result)
+            {
+                $('#branch').val(oldBranch[planID]);
+                $('#branch').trigger("chosen:updated");
+            }
        }

-        if(result)
+        if(conflictStories == '' || result)
        {
            var link = createLink('productplan', 'ajaxGetTopPlan', "productID=" + productID + "&branch=" + branch);
            $.post(link, function(data)