Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

Browse Source 
* fix bug #20652,#20511,#20643

See merge request easycorp/zentaopms!2187
This commit is contained in:
王怡栋
2022-03-11 06:31:15 +00:00
parent 99c23e96e2 1c518b7a9b
commit 951fdbc1b6
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/my/ext/view/task.html.php
-1
View File
@@ -139,7 +139,6 @@
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true, '', '', $task->project);
common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='95%'", '', $task->project);
common::printIcon('task', 'batchCreate', "executionID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=true", $task, 'list', 'split', '', 'iframe', true, "data-width='95%'", $this->lang->task->children, $task->project);
}
}
?>
extension/lite/my/ext/view/todo.calendar.html.hook.php
-3
View File
@@ -1,3 +0,0 @@
<?php
$calendarHookFile = $app->getExtensionRoot() . 'biz/my/ext/view/todo.calendar.html.hook.php';
if(file_exists($calendarHookFile)) include $calendarHookFile;
extension/lite/story/ext/view/batchedit.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
<tr>
<td><?php echo $storyID . html::hidden("storyIdList[$storyID]", $storyID);?></td>
<td class='text-left'>
<?php echo html::select("modules[$storyID]", isset($modules[$story->product][$story->branch]) ? $modules[$story->product][$story->branch] : array('0' => '/'), $story->module, "class='form-control chosen'");?>
<?php echo html::select("modules[$storyID]", isset($moduleList[$story->id]) ? $moduleList[$story->id] : array('0' => '/'), $story->module, "class='form-control chosen'");?>
</td>
<td title='<?php echo $story->title?>'>
<div class="input-group">