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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
daitingting
2017-04-27 11:06:18 +08:00
parent 492a8983a6 c04f3dc4d8
commit 230c8fcd68
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+1
View File
@@ -514,6 +514,7 @@ class project extends control
$this->view->browseType = $browseType;
$this->view->param = $param;
$this->view->users = $users;
$this->view->project = $this->project->getByID($projectID);
$this->view->projectID = $projectID;
$this->display();
}
module/project/model.php
+1
View File
@@ -1219,6 +1219,7 @@ class projectModel extends model
$task->name = $bug->title;
$task->type = 'devel';
$task->pri = $bugToTasks->pri[$key];
$task->deadline = $bugToTasks->deadline[$key];
$task->consumed = 0;
$task->status = 'wait';
$task->openedDate = $now;
module/project/view/importbug.html.php
+5 -1
View File
@@ -11,6 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<script>
$(function(){$(".preview").modalTrigger({width:1000, type:'iframe'});});
@@ -35,6 +36,7 @@ var browseType = '<?php echo $browseType;?>';
<th class='w-80px'><?php echo $lang->task->pri;?></th>
<th class='w-150px'><?php echo $lang->task->assignedTo;?></th>
<th class='w-80px nobr {sorter:false}'><?php echo $lang->task->estimate;?></th>
<th class='w-120px {sorter:false}'><?php echo $lang->task->deadline;?></th>
</tr>
</thead>
<tbody>
@@ -51,12 +53,14 @@ var browseType = '<?php echo $browseType;?>';
<td class='td-has-control'><?php echo html::select("pri[$bug->id]", $lang->task->priList, 3, "class='input-sm form-control'");?></td>
<td class='td-has-control text-left' style='overflow:visible'><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='input-sm form-control chosen'");?></td>
<td class='td-has-control'><?php echo html::input("estimate[$bug->id]", '', 'size=4 class="input-sm form-control" autocomplete="off"');?></td>
<?php $deadline = ($bug->deadline > helper::today() and $bug->deadline > $project->begin) ? $bug->deadline : '0000-00-00';?>
<td class='td-has-control'><?php echo html::input("deadline[$bug->id]", $deadline, 'size=4 class="input-sm form-control form-date" autocomplete="off"');?></td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot>
<tr>
<td colspan='8'>
<td colspan='9'>
<div class='table-actions clearfix'><?php echo html::selectButton() . html::submitButton($lang->import) . html::backButton();?>
</div>
<?php $pager->show();?>