*Finish task #46095.

This commit is contained in:
songchenxuan
2021-12-20 18:13:23 +08:00
parent ca1230076f
commit 65e41ae440
2 changed files with 1 additions and 9 deletions
+1 -8
View File
@@ -721,14 +721,7 @@ class productplan extends control
if($story->branch and $story->branch != $newBranch) $conflictStoryIdList .= '[' . $storyID . ']';
}
}
if($conflictStoryIdList != '')
{
echo sprintf($this->lang->story->confirmChangePlan, $conflictStoryIdList);
}
else
{
echo '';
}
if($conflictStoryIdList != '') echo sprintf($this->lang->story->confirmChangePlan, $conflictStoryIdList);
}
/**
-1
View File
@@ -30,7 +30,6 @@ function loadWarning(planID, branch)
{
if(conflictStories != '' && !confirm(conflictStories))
{
console.log('yes');
$('#branch' + planID).val(oldBranch[planID]);
$('#branch' + planID).trigger("chosen:updated");
}