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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug

Browse Source
This commit is contained in:
Zongjun Lan
2022-04-24 15:25:35 +08:00
parent 05c0486560 422383fe9d
commit 15d35f955d
15 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update16.5.sql
+2
View File
@@ -84,3 +84,5 @@ REPLACE INTO `zt_zoutput` (`id`, `activity`, `name`, `content`, `optional`, `sta
(78,52,'禅道缺陷记录','','','','admin','2020-01-09 14:22:52','','0000-00-00 00:00:00',390,'0'),
(89,58,'禅道缺陷跟踪系统记录项','','yes','','admin','2020-01-09 14:25:16','','0000-00-00 00:00:00',445,'0'),
(99,64,'禅道缺陷记录项','','yes','','admin','2020-01-09 14:26:52','','0000-00-00 00:00:00',495,'0');
DELETE FROM `zt_config` WHERE `section` = 'customMenu';
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/common/view/footer.html.php
+2 -1
View File
@@ -16,11 +16,12 @@ needPing = false;
$(function()
{
var windowBlur = false;
if(window.Notification)
if(window.Notification && Notification.permission == 'granted')
{
window.onblur = function(){windowBlur = true;}
window.onfocus = function(){windowBlur = false;}
}
setInterval(function()
{
$.get(createLink('message', 'ajaxGetMessage', "windowBlur=" + (windowBlur ? '1' : '0')), function(data)
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/gitlab/css/common.css
+1
View File
@@ -1 +1,2 @@
#publicTip {padding-left: 10px;}
.table-form>tbody>tr>th {width: 110px;}
module/mr/model.php
+1
View File
@@ -1392,6 +1392,7 @@ class mrModel extends model
->where('t1.AType')->eq('mr')
->andWhere('t1.BType')->eq($objectType)
->andWhere('t1.BID')->eq($objectID)
->andWhere('t2.id')->ne(0)
->fetchPairs();
}
module/product/css/kanban.css
View File
module/product/css/kanban.en.css
+1
View File
@@ -0,0 +1 @@
#kanbanList .kanban-lane {min-height: 140px !important;}
module/product/css/kanban.zh-cn.css
+1
View File
@@ -0,0 +1 @@
#kanbanList .kanban-lane {min-height: 115px !important;}
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/repo/css/common.css
+1
View File
@@ -16,6 +16,7 @@ h3 {font-size: 16px;}
.versions {position: relative;}
#diffRepo {position: absolute; left: 20px; z-index: 1000;}
#repoID {display: inline-block; width: auto;}
.table-form>tbody>tr>th {width: 110px;}
.repoCode a:hover {text-decoration: none;}
.commentButton
{
module/stage/model.php
+7 -3
View File
@@ -30,7 +30,11 @@ class stageModel extends model
if(round($totalPercent + $stage->percent) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
$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;
@@ -62,7 +66,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');
@@ -91,7 +95,7 @@ class stageModel extends model
if(round($totalPercent + $stage->percent - $oldStage->percent) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
$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;
module/task/view/batchedit.html.php
+1 -1
View File
@@ -132,7 +132,7 @@ js::set('dittoNotice', $dittoNotice);
<td <?php echo zget($visibleFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadlines[$taskID]", helper::isZeroDate($tasks[$taskID]->deadline) ? '' : $tasks[$taskID]->deadline, "class='form-control text-center form-date'");?></td>
<td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$taskID]", $priList, $tasks[$taskID]->pri, "class='form-control'");?></td>
<td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimates[$taskID]", $tasks[$taskID]->estimate, "class='form-control text-center' {$disableHour}");?></td>
<td <?php echo zget($visibleFields, 'record', "class='hidden'")?>><?php echo html::input("consumeds[$taskID]", '', "class='form-control text-center' {$disableHour}");?></td>
<td <?php echo zget($visibleFields, 'record', "class='hidden'")?>><?php echo html::input("consumeds[$taskID]", 0, "class='form-control text-center' {$disableHour}");?></td>
<td <?php echo zget($visibleFields, 'left', "class='hidden'")?>><?php echo html::input("lefts[$taskID]", $tasks[$taskID]->left, "class='form-control text-center' {$disableHour}");?></td>
<td class='text-left<?php echo zget($visibleFields, 'finishedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("finishedBys[$taskID]", $members, $tasks[$taskID]->finishedBy, "class='form-control chosen'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'canceledBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("canceledBys[$taskID]", $members, $tasks[$taskID]->canceledBy, "class='form-control chosen'");?></td>
module/todo/control.php
+1 -1
View File
@@ -633,7 +633,7 @@ class todo extends control
$this->post->set('fields', $fields);
$this->post->set('rows', $todos);
$this->post->set('kind', $this->lang->todo->common);
$this->post->set('kind', 'todo');
$this->fetch('file', 'export2' . $this->post->fileType, $_POST);
}