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

Merge branch 'fixbug' into 'master'

Browse Source 
* Fix bug #17602,14850,21439.

See merge request easycorp/zentaopms!3097
This commit is contained in:
王怡栋
2022-04-24 07:00:04 +00:00
parent 048688e7e0 c72bd0a1df
commit 480ca71da8
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/task/ext/view/batchcreate.html.php
+1 -1
View File
@@ -135,7 +135,7 @@
</td>
<td <?php echo zget($visibleFields, 'region', "class='hidden'")?> style='overflow:visible'><?php echo html::select("region[$i]", $regionList, isset($regionID) ? $regionID : '', "class='form-control chosen' onchange='loadLaneGroup(this.value, $i)'");?></td>
<td <?php echo zget($visibleFields, 'lane', "class='hidden'")?> style='overflow:visible'><?php echo html::select("lane[$i]", $lanes, '', "class='form-control chosen'");?></td>
<td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
<td><?php echo html::select("type[$i]", $lang->task->typeList, $type, "class='form-control chosen'");?></td>
<td <?php echo zget($visibleFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
<td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[$i]", '', "class='form-control text-center'");?></td>
<td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>>
module/execution/css/all.css
+2
View File
@@ -26,3 +26,5 @@ td.flex span.project-type-label {margin-left: 5px; min-width: 36px;}
td.flex span.project-type-label {min-width: 40px;}
.label-children {min-width:22px !important;}
.c-name > a, .table-children .text-left > a {padding-left: 5px;}
.has-child > span {margin-right: 5px;}
module/execution/view/treestory.html.php
+2
View File
@@ -199,6 +199,7 @@
<div class="detail-content">
<table class="table table-data">
<tbody>
<?php if($this->config->vision != 'lite'):?>
<?php if(!empty($fromBug)):?>
<tr class='text-top'>
<th class='thWidth'><?php echo $lang->story->legendFromBug;?></th>
@@ -243,6 +244,7 @@
<?php endif;?>
</td>
</tr>
<?php endif;?>
<tr class='text-top'>
<th><?php echo $lang->story->legendLinkStories;?></th>
<td class='pd-0'>
module/programplan/view/create.html.php
+2
View File
@@ -22,6 +22,7 @@
echo "<span class='text'>{$title}</span>";
?>
</span>
<?php if($productList):?>
<div class='btn-group'>
<?php $viewName = $productID != 0 ? zget($productList,$productID) : current($productList);?>
<a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo $viewName;?>'><?php echo $viewName;?></span> <span class='caret'></span></a>
@@ -34,6 +35,7 @@
?>
</ul>
</div>
<?php endif;?>
</div>
</div>
<?php $hideAttribute = $planID == 0 ? '' : ' hidden'?>
module/stage/model.php
+7 -3
View File
@@ -26,7 +26,11 @@ class stageModel extends model
->add('createdDate', helper::today())
->get();
$this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec();
$this->dao->insert(TABLE_STAGE)
->data($stage)
->autoCheck()
->checkIF($stage->percent != '', 'percent', 'float')
->exec();
if(!dao::isError()) return $this->dao->lastInsertID();
return false;
@@ -54,7 +58,7 @@ class stageModel extends model
$stage->createdBy = $this->app->user->account;
$stage->createdDate = helper::today();
$this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec();
$this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->exec();
$stageID = $this->dao->lastInsertID();
$this->action->create('stage', $stageID, 'Opened');
@@ -79,7 +83,7 @@ class stageModel extends model
->add('editedDate', helper::today())
->get();
$this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->where('id')->eq((int)$stageID)->exec();
$this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->where('id')->eq((int)$stageID)->exec();
if(!dao::isError()) return common::createChanges($oldStage, $stage);
return false;