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

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

Browse Source
This commit is contained in:
tianshujie98
2020-08-07 17:33:29 +08:00
parent 0bfb09736e 3eb3fcce02
commit b38e6d0cf6
12 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update12.4.sql
+1
View File
@@ -0,0 +1 @@
update zt_action set `project` = `extra` where action = 'unlinkedfromproject' and `project` = 0;
module/productplan/control.php
+2 -2
View File
@@ -266,8 +266,8 @@ class productplan extends control
$this->commonAction($plan->product, $plan->branch);
$products = $this->product->getPairs();
$bugPager = new pager($type == 'bug' ? $recTotal : 0, $recPerPage, $type == 'bug' ? $pageID : 1);
$storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1);
$bugPager = new pager(0, $recPerPage, $type == 'bug' ? $pageID : 1);
$storyPager = new pager(0, $recPerPage, $type == 'story' ? $pageID : 1);
$planStories = $this->loadModel('story')->getPlanStories($planID, 'all', $type == 'story' ? $sort : 'id_desc', $storyPager);
if($reSort)
{
module/repo/control.php
+1 -1
View File
@@ -548,7 +548,7 @@ class repo extends control
if(isset($pathInfo["extension"])) $suffix = strtolower($pathInfo["extension"]);
$arrange = $this->cookie->arrange ? $this->cookie->arrange : 'inline';
if(!empty($_POST))
if($this->server->request_method)
{
$oldRevision = isset($this->post->revision[1]) ?$this->post->revision[1] : '';
$newRevision = isset($this->post->revision[0]) ?$this->post->revision[0] : '';
module/repo/view/ajaxsidecommits.html.php
-1
View File
@@ -50,7 +50,6 @@ if(isset($entry)) $pathInfo .= '&type=file';
</tbody>
</table>
<div class='table-footer'>
<?php echo html::hidden('isPost', true);?>
<?php if(common::hasPriv('repo', 'diff')) echo html::submitButton($lang->repo->diff, '', count($revisions) < 2 ? 'disabled btn btn-primary' : 'btn btn-primary')?>
<?php echo html::a($this->repo->createLink('log', "repoID=$repoID&entry=&revision=HEAD&type=$logType", "entry=" . $this->repo->encodePath($path)), $lang->repo->allLog, '', "class='allLogs'");?>
<div class='pull-right'>
module/repo/view/log.html.php
+1 -4
View File
@@ -82,10 +82,7 @@
</tbody>
</table>
<div class='table-footer'>
<?php
echo html::hidden('isPost', true);
echo html::submitButton($lang->repo->diff, '', 'btn btn-primary');
?>
<?php echo html::submitButton($lang->repo->diff, '', 'btn btn-primary')?>
<?php $pager->show('right', 'pagerjs');?>
</div>
</form>
module/story/lang/de.php
+1 -1
View File
@@ -225,7 +225,7 @@ $lang->story->errorNotSubdivide = "If the status is not active, or the stage
$lang->story->mustChooseResult = 'Ergebnis wählen';
$lang->story->mustChoosePreVersion = 'Version wählen um es umzukhren.';
$lang->story->noStory = 'Keine Storys. ';
$lang->story->ignoreChangeStage = 'Story %s is a draft. Please review it..';
$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..';
$lang->story->cannotDeleteParent = "Can not delete parent {$lang->storyCommon}";
$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
module/story/lang/en.php
+1 -1
View File
@@ -225,7 +225,7 @@ $lang->story->errorNotSubdivide = "If the status is not active, or the stage
$lang->story->mustChooseResult = 'Select Result';
$lang->story->mustChoosePreVersion = 'Select a version to revert to.';
$lang->story->noStory = 'No stories yet. ';
$lang->story->ignoreChangeStage = 'Story %s is a draft. Please review it..';
$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..';
$lang->story->cannotDeleteParent = "Can not delete parent {$lang->storyCommon}";
$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
module/story/lang/zh-cn.php
+1 -1
View File
@@ -225,7 +225,7 @@ $lang->story->errorNotSubdivide = "状态不是激活，或者阶段不是
$lang->story->mustChooseResult = '必须选择评审结果';
$lang->story->mustChoosePreVersion = '必须选择回溯的版本';
$lang->story->noStory = "暂时没有{$lang->storyCommon}。";
$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 为草稿状态，没有修改其阶段。";
$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 为草稿状态或已关闭状态，没有修改其阶段。";
$lang->story->cannotDeleteParent = "不能删除父{$lang->storyCommon}";
$lang->story->moveChildrenTips = "修改父{$lang->storyCommon}的所属产品会将其下的子{$lang->storyCommon}也移动到所选产品下。";
module/story/lang/zh-tw.php
+1 -1
View File
@@ -225,7 +225,7 @@ $lang->story->errorNotSubdivide = "狀態不是激活，或者階段不是
$lang->story->mustChooseResult = '必須選擇評審結果';
$lang->story->mustChoosePreVersion = '必須選擇回溯的版本';
$lang->story->noStory = "暫時沒有{$lang->storyCommon}。";
$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 為草稿狀態，沒有修改其階段。";
$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 為草稿狀態或已關閉狀態，沒有修改其階段。";
$lang->story->cannotDeleteParent = "不能刪除父{$lang->storyCommon}";
$lang->story->moveChildrenTips = "修改父{$lang->storyCommon}的所屬產品會將其下的子{$lang->storyCommon}也移動到所選產品下。";
module/story/model.php
+1 -2
View File
@@ -1306,7 +1306,7 @@ class storyModel extends model
foreach($storyIdList as $storyID)
{
$oldStory = $oldStories[$storyID];
if($oldStory->status == 'draft')
if($oldStory->status == 'draft' or $oldStory->status == 'closed')
{
$ignoreStories .= "#{$storyID} ";
continue;
@@ -1320,7 +1320,6 @@ class storyModel extends model
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
$this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($stage)->set('stagedBy')->eq($account)->where('story')->eq((int)$storyID)->exec();
$this->setStage($storyID);
if(!dao::isError()) $allChanges[$storyID] = common::createChanges($oldStory, $story);
}
if($ignoreStories) echo js::alert(sprintf($this->lang->story->ignoreChangeStage, $ignoreStories));
module/task/model.php
+1
View File
@@ -1075,6 +1075,7 @@ class taskModel extends model
foreach($tasks as $taskID => $task)
{
if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
$oldTask = $oldTasks[$taskID];
$this->dao->update(TABLE_TASK)->data($task)
->autoCheck()
module/task/view/batchedit.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
<th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->task->status;?></th>
<th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->task->pri;?></th>
<th class='w-70px<?php echo zget($visibleFields, 'estimate', ' hidden') . zget($requiredFields, 'estimate', '', ' required');?>'><?php echo $lang->task->estimateAB;?></th>
<th class='w-70px<?php echo zget($visibleFields, 'record', ' hidden') . zget($requiredFields, 'record', '', ' required');?>'><?php echo $lang->task->consumed;?></th>
<th class='w-70px<?php echo zget($visibleFields, 'record', ' hidden') . zget($requiredFields, 'record', '', ' required');?>'><?php echo $lang->task->consumedThisTime;?></th>
<th class='w-70px<?php echo zget($visibleFields, 'left', ' hidden') . zget($requiredFields, 'left', '', ' required');?>'><?php echo $lang->task->leftAB?></th>
<th class='w-90px<?php echo zget($visibleFields, 'estStarted', ' hidden') . zget($requiredFields, 'estStarted', '', ' required');?>'><?php echo $lang->task->estStarted?></th>
<th class='w-90px<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->task->deadline?></th>