* Finish task #43960.
This commit is contained in:
@@ -1878,7 +1878,7 @@ class execution extends control
|
||||
}
|
||||
|
||||
$userList = array();
|
||||
$avatarPairs = $this->dao->select('account, avatar')->from(TABLE_USER)->where('deleted')->eq(0)->fetchPairs();
|
||||
$avatarPairs = $this->dao->select('account, avatar')->from(TABLE_USER)->where('deleted')->eq(0)->fetchPairs();
|
||||
foreach($avatarPairs as $account => $avatar)
|
||||
{
|
||||
if(!$avatar) continue;
|
||||
@@ -2079,6 +2079,14 @@ class execution extends control
|
||||
}
|
||||
}
|
||||
|
||||
/* Close the page when there is no data. */
|
||||
$hasData = false;
|
||||
foreach($datas as $data)
|
||||
{
|
||||
if(!empty($data)) $hasData = true;
|
||||
}
|
||||
if(!$hasData) die(js::alert($this->lang->execution->noPrintData) . js::close());
|
||||
|
||||
$this->execution->saveKanbanData($executionID, $originalDatas);
|
||||
|
||||
$hasBurn = $this->post->content == 'all';
|
||||
@@ -2104,8 +2112,7 @@ class execution extends control
|
||||
$this->execution->setMenu($executionID);
|
||||
$execution = $this->execution->getById($executionID);
|
||||
|
||||
$this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
|
||||
$this->view->position[] = $this->lang->execution->printKanban;
|
||||
$this->view->executionID = $executionID;
|
||||
$this->display();
|
||||
}
|
||||
|
||||
|
||||
@@ -316,6 +316,7 @@ $lang->execution->byPeriod = 'By Time';
|
||||
$lang->execution->byUser = 'By User';
|
||||
$lang->execution->noExecution = "No {$lang->executionCommon}. ";
|
||||
$lang->execution->noExecutions = "No {$lang->execution->common}.";
|
||||
$lang->execution->noPrintData = "No data can be printed.";
|
||||
$lang->execution->noMembers = 'No team members yet. ';
|
||||
$lang->execution->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
|
||||
// $lang->execution->linkProjectStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)";
|
||||
|
||||
@@ -316,6 +316,7 @@ $lang->execution->byPeriod = '按时间段';
|
||||
$lang->execution->byUser = '按用户';
|
||||
$lang->execution->noExecution = "暂时没有{$lang->executionCommon}。";
|
||||
$lang->execution->noExecutions = "暂时没有{$lang->execution->common}。";
|
||||
$lang->execution->noPrintData = "暂无数据可打印";
|
||||
$lang->execution->noMembers = '暂时没有团队成员。';
|
||||
$lang->execution->workloadTotal = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s";
|
||||
// $lang->execution->linkProjectStoryTip = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})";
|
||||
|
||||
@@ -3,13 +3,14 @@
|
||||
* The kanban view file of execution module of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
|
||||
* @author Wang Yidong, Zhu Jinyong
|
||||
* @author Wang Yidong, Zhu Jinyong
|
||||
* @package execution
|
||||
* @version $Id: kanban.html.php $
|
||||
*/
|
||||
?>
|
||||
<?php if($_POST) die(include 'preview.html.php')?>
|
||||
<?php include '../../common/view/header.lite.html.php';?>
|
||||
<?php js::set('executionID', $executionID);?>
|
||||
<main class='main'>
|
||||
<div class='container'>
|
||||
<div id='mainContent' class='main-content'>
|
||||
|
||||
@@ -49,8 +49,10 @@ $lang->kanban->noColumnUniqueName = 'The Kanban column name already exists.';
|
||||
$lang->kanban->moveUp = 'Swimlane Up';
|
||||
$lang->kanban->moveDown = 'Swimlane Down';
|
||||
$lang->kanban->laneMove = 'Swimlane Sorting';
|
||||
$lang->kanban->laneGroup = 'Lane Group';
|
||||
$lang->kanban->cardsSort = 'Cards Sortting';
|
||||
$lang->kanban->moreAction = 'More Action';
|
||||
$lang->kanban->noGroup = 'None';
|
||||
|
||||
$lang->kanban->error = new stdclass();
|
||||
$lang->kanban->error->mustBeInt = 'The WIPs must be positive integer.';
|
||||
|
||||
@@ -49,8 +49,10 @@ $lang->kanban->noColumnUniqueName = '看板列名称已存在';
|
||||
$lang->kanban->moveUp = '泳道上移';
|
||||
$lang->kanban->moveDown = '泳道下移';
|
||||
$lang->kanban->laneMove = '泳道排序';
|
||||
$lang->kanban->laneGroup = '泳道分组';
|
||||
$lang->kanban->cardsSort = '卡片排序';
|
||||
$lang->kanban->moreAction = '更多操作';
|
||||
$lang->kanban->noGroup = '无';
|
||||
|
||||
$lang->kanban->error = new stdclass();
|
||||
$lang->kanban->error->mustBeInt = '在制品数量必须是正整数。';
|
||||
@@ -95,8 +97,6 @@ $lang->kanban->taskColumn['pause'] = '已暂停';
|
||||
$lang->kanban->taskColumn['canceled'] = '已取消';
|
||||
$lang->kanban->taskColumn['closed'] = '已关闭';
|
||||
|
||||
$lang->kanban->noGroup = '无';
|
||||
|
||||
$lang->kanbancolumn = new stdclass();
|
||||
$lang->kanbancolumn->limit = $lang->kanban->WIPCount;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user