Merge branch 'sprint/231_liumengyi_26841' into 'master'
* Fix bug #26841. See merge request easycorp/zentaopms!5101
This commit is contained in:
@@ -449,7 +449,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
|
||||
echo "<ul class='dropdown-list'>";
|
||||
foreach($branchTagOption as $id => $branchName)
|
||||
{
|
||||
$actionLink = $this->createLink('story', 'batchChangeBranch', "branchID=$id");
|
||||
$actionLink = $this->createLink('story', 'batchChangeBranch', "branchID=$id&confirm=&storyIdList=&storyType=$storyType");
|
||||
echo "<li class='option' data-key='$id'>" . html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#productStoryForm')\"") . "</li>";
|
||||
}
|
||||
echo '</ul>';
|
||||
@@ -549,7 +549,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
|
||||
<button data-toggle="dropdown" type="button" class="btn assignedTo"><?php echo $lang->story->assignedTo;?> <span class="caret"></span></button>
|
||||
<?php
|
||||
$withSearch = count($users) > 10;
|
||||
$actionLink = $this->createLink('story', 'batchAssignTo', "productID=$productID");
|
||||
$actionLink = $this->createLink('story', 'batchAssignTo', "storyType=$storyType");
|
||||
echo html::select('assignedTo', $users, '', 'class="hidden"');
|
||||
?>
|
||||
<div class="dropdown-menu search-list<?php if($withSearch) echo ' search-box-sink';?>" data-ride="searchList">
|
||||
|
||||
Reference in New Issue
Block a user