Merge branch 'sprint/tianshujie_23349' into 'master'
* Fix bug #23349. See merge request easycorp/zentaopms!3772
This commit is contained in:
@@ -103,6 +103,7 @@ body {margin-bottom: 25px;}
|
||||
?>
|
||||
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->product->searchStory;?></a>
|
||||
</div>
|
||||
<?php $taskCreateLink = $this->createLink('task', 'create', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));?>
|
||||
<?php if(!isonlybody()): ?>
|
||||
<div class="btn-toolbar pull-right">
|
||||
<?php
|
||||
@@ -147,7 +148,6 @@ body {margin-bottom: 25px;}
|
||||
<?php
|
||||
$checkObject = new stdclass();
|
||||
$checkObject->execution = $executionID;
|
||||
$taskCreateLink = $this->createLink('task', 'create', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));
|
||||
?>
|
||||
<?php if($canBeChanged and (common::hasPriv('task', 'batchCreate', $checkObject) or common::hasPriv('task', 'create', $checkObject))):?>
|
||||
<div class='btn-group dropdown'>
|
||||
|
||||
Reference in New Issue
Block a user