*Finish task #46095.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user