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

Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4

Browse Source
This commit is contained in:
wangyidong
2023-04-25 10:26:03 +08:00
parent d01395e6b0 af2e8e00e9
commit e22590328e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/projectrelease/view/view.html.php
+1 -1
View File
@@ -312,7 +312,7 @@
?>
<td class='c-build' title='<?php echo $openedBuildName?>'><?php echo $openedBuildName;?></td>
<td class='c-user'><?php echo zget($users, $bug->openedBy);?></td>
<td class='c-date'><?php echo $bug->openedDate?></td>
<td class='c-date'><?php echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);?></td>
<td class='c-actions'>
<?php
if(common::hasPriv('projectrelease', 'unlinkBug') and $canBeChanged)
module/stage/model.php
+1 -1
View File
@@ -136,7 +136,7 @@ class stageModel extends model
{
if($projectID)
{
return $this->dao->select('id,name,type,percent,openedBy as createdBy,begin as createdDate,lastEditedBy as editedBy,end as editedDate,deleted')
return $this->dao->select('`id`,name,type,percent,openedBy as createdBy,`begin` as createdDate,lastEditedBy as editedBy,end as editedDate,deleted')
->from(TABLE_EXECUTION)
->where('type')->in('sprint,stage,kanban')
->andWhere('deleted')->eq('0')