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

* finish task #7761,7766.

Browse Source
This commit is contained in:
z
2020-09-01 14:44:09 +08:00
parent 521cea2844
commit 0a6056ceac
8 changed files with 199 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+42 -34
View File
@@ -96,6 +96,11 @@ class block extends control
$block = $this->block->getByID($id);
if($block and empty($type)) $type = $block->block;
if(isset($block->params->num) and !isset($block->params->count))
{
$block->params->count = $block->params->num;
unset($block->params->num);
}
if(isset($this->lang->block->moduleList[$source]))
{
@@ -232,6 +237,8 @@ class block extends control
}
$block->params = json_decode($block->params);
if(isset($block->params->num) and !isset($block->params->count)) $block->params->count = $block->params->num;
$blockID = $block->block;
$source = empty($block->source) ? 'common' : $block->source;
@@ -439,6 +446,7 @@ class block extends control
$params = $this->get->param;
$params = json_decode(base64_decode($params));
if(isset($params->num) and !isset($params->count)) $params->count = $params->num;
if(!$this->selfCall)
{
$this->app->user = $this->dao->select('*')->from(TABLE_USER)->where('ranzhi')->eq($params->account)->fetch();
@@ -525,7 +533,7 @@ class block extends control
*/
public function printTodoBlock()
{
$limit = $this->viewType == 'json' ? 0 : (int)$this->params->num;
$limit = $this->viewType == 'json' ? 0 : (int)$this->params->count;
$todos = $this->loadModel('todo')->getList('all', $this->app->user->account, 'wait, doing', $limit, $pager = null, $orderBy = 'date, begin');
$uri = $this->app->getURI(true);
$this->session->set('todoList', $uri);
@@ -555,7 +563,7 @@ class block extends control
if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$programID = $this->view->block->module == 'my' ? 0 : (int)$this->session->program;
$this->view->tasks = $this->loadModel('task')->getUserTasks($this->app->user->account, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->num, null, $this->params->orderBy, $programID);
$this->view->tasks = $this->loadModel('task')->getUserTasks($this->app->user->account, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $this->params->orderBy, $programID);
}
/**
@@ -570,7 +578,7 @@ class block extends control
if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$programID = $this->view->block->module == 'my' ? 0 : (int)$this->session->program;
$this->view->bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $this->params->type, $this->params->orderBy, $this->viewType == 'json' ? 0 : (int)$this->params->num, null, $programID);
$this->view->bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $this->params->type, $this->params->orderBy, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $programID);
}
/**
@@ -598,7 +606,7 @@ class block extends control
->andWhere('t2.deleted')->eq(0)
->beginIF($this->view->block->module != 'my' and $this->session->program)->andWhere('t2.program')->eq((int)$this->session->program)->fi()
->orderBy($this->params->orderBy)
->beginIF($this->viewType != 'json')->limit((int)$this->params->num)->fi()
->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
->fetchAll();
}
elseif($this->params->type == 'openedbyme')
@@ -607,7 +615,7 @@ class block extends control
->andWhere('deleted')->eq(0)
->beginIF($this->view->block->module != 'my' and $this->session->program)->andWhere('program')->eq((int)$this->session->program)->fi()
->orderBy($this->params->orderBy)
->beginIF($this->viewType != 'json')->limit((int)$this->params->num)->fi()
->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
->fetchAll();
}
$this->view->cases = $cases;
@@ -635,7 +643,7 @@ class block extends control
->andWhere('t1.product = t5.product')
->beginIF($this->params->type != 'all')->andWhere('t1.status')->eq($this->params->type)->fi()
->orderBy('t1.id desc')
->beginIF($this->viewType != 'json')->limit((int)$this->params->num)->fi()
->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
->fetchAll();
}
@@ -650,8 +658,8 @@ class block extends control
$this->session->set('storyList', $this->app->getURI(true));
if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$this->app->loadClass('pager', $static = true);
$num = isset($this->params->num) ? (int)$this->params->num : 0;
$pager = pager::init(0, $num , 1);
$count = isset($this->params->count) ? (int)$this->params->count : 0;
$pager = pager::init(0, $count , 1);
$type = isset($this->params->type) ? $this->params->type : 'assignedTo';
$orderBy = isset($this->params->type) ? $this->params->orderBy : 'id_asc';
@@ -675,7 +683,7 @@ class block extends control
->beginIF($this->view->block->module != 'my' and $this->session->program)->andWhere('t2.program')->eq((int)$this->session->program)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
->orderBy('t1.begin desc')
->beginIF($this->viewType != 'json')->limit((int)$this->params->num)->fi()
->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
->fetchAll();
}
@@ -696,7 +704,7 @@ class block extends control
->beginIF($this->view->block->module != 'my' and $this->session->program)->andWhere('t1.program')->eq((int)$this->session->program)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
->orderBy('t1.id desc')
->beginIF($this->viewType != 'json')->limit((int)$this->params->num)->fi()
->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
->fetchAll();
}
@@ -716,7 +724,7 @@ class block extends control
->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in($this->app->user->view->projects)->fi()
->beginIF($this->view->block->module != 'my' and $this->session->program)->andWhere('t1.program')->eq((int)$this->session->program)->fi()
->orderBy('t1.id desc')
->beginIF($this->viewType != 'json')->limit((int)$this->params->num)->fi()
->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
->fetchAll();
}
@@ -725,7 +733,7 @@ class block extends control
$this->app->loadLang('project');
$this->app->loadLang('task');
$this->view->programs = $this->loadModel('program')->getProgramOverview('byStatus', 'all', $this->params->orderBy, $this->params->num);
$this->view->programs = $this->loadModel('program')->getProgramOverview('byStatus', 'all', $this->params->orderBy, $this->params->count);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
}
@@ -739,9 +747,9 @@ class block extends control
{
$this->app->loadClass('pager', $static = true);
if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$num = isset($this->params->num) ? (int)$this->params->num : 0;
$count = isset($this->params->count) ? (int)$this->params->count : 0;
$type = isset($this->params->type) ? $this->params->type : '';
$pager = pager::init(0, $num , 1);
$pager = pager::init(0, $count , 1);
$productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type);
$productIdList = array();
@@ -787,8 +795,8 @@ class block extends control
$this->app->loadLang('story');
/* Set program status and count. */
$status = isset($this->params->type) ? $this->params->type : 'all';
$count = isset($this->params->num) ? (int)$this->params->num : 15;
$status = isset($this->params->type) ? $this->params->type : 'all';
$count = isset($this->params->count) ? (int)$this->params->count : 15;
/* Get programs. */
$programs = $this->loadModel('program')->getProgramOverview('byStatus', $status, 'id_desc', $count);
@@ -853,9 +861,9 @@ class block extends control
if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$status = isset($this->params->type) ? $this->params->type : '';
$num = isset($this->params->num) ? $this->params->num : '';
$count = isset($this->params->count) ? $this->params->count : '';
$products = $this->loadModel('product')->getOrderedProducts($status, $num);
$products = $this->loadModel('product')->getOrderedProducts($status, $count);
$productIdList = array_keys($products);
if(empty($products))
@@ -984,12 +992,12 @@ class block extends control
$this->app->loadLang('story');
$this->app->loadLang('bug');
$status = isset($this->params->type) ? $this->params->type : '';
$num = isset($this->params->num) ? (int)$this->params->num : 0;
$status = isset($this->params->type) ? $this->params->type : '';
$count = isset($this->params->count) ? (int)$this->params->count : 0;
/* Get projects. */
$programID = $this->view->block->module == 'my' ? 0 : (int)$this->session->program;
$projects = $this->loadModel('project')->getOrderedProjects($status, $num, $programID);
$projects = $this->loadModel('project')->getOrderedProjects($status, $count, $programID);
if(empty($projects))
{
$this->view->projects = $projects;
@@ -1162,7 +1170,7 @@ class block extends control
$this->session->set('issueList', $uri);
if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->program, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->num, $this->params->orderBy);
$this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->program, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
}
/**
@@ -1176,7 +1184,7 @@ class block extends control
$uri = $this->app->getURI(true);
$this->session->set('riskList', $uri);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->program, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->num, $this->params->orderBy);
$this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->program, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
}
/**
@@ -1264,9 +1272,9 @@ class block extends control
{
$this->app->loadClass('pager', $static = true);
if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$num = isset($this->params->num) ? (int)$this->params->num : 0;
$count = isset($this->params->count) ? (int)$this->params->count : 0;
$type = isset($this->params->type) ? $this->params->type : 'all';
$pager = pager::init(0, $num, 1);
$pager = pager::init(0, $count, 1);
$this->view->projectStats = $this->loadModel('project')->getProjectStats($type, $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'order_desc', $this->viewType != 'json' ? $pager : '', $this->session->program);
}
@@ -1404,7 +1412,7 @@ class block extends control
->andWhere('t1.product = t5.product')
->beginIF($this->params->type != 'all')->andWhere('t1.status')->eq($this->params->type)->fi()
->orderBy('t1.id desc')
->beginIF($this->viewType != 'json')->limit((int)$this->params->num)->fi()
->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
->fetchAll();
}
@@ -1419,10 +1427,10 @@ class block extends control
if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$this->app->loadLang('bug');
$status = isset($this->params->type) ? $this->params->type : '';
$num = isset($this->params->num) ? (int)$this->params->num : 0;
$status = isset($this->params->type) ? $this->params->type : '';
$count = isset($this->params->count) ? (int)$this->params->count : 0;
$products = $this->loadModel('product')->getOrderedProducts($status, $num);
$products = $this->loadModel('product')->getOrderedProducts($status, $count);
$productIdList = array_keys($products);
if(empty($products))
@@ -1592,9 +1600,9 @@ class block extends control
{
$this->app->loadClass('pager', $static = true);
if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$num = isset($this->params->num) ? (int)$this->params->num : 0;
$type = isset($this->params->type) ? $this->params->type : 'all';
$pager = pager::init(0, $num, 1);
$count = isset($this->params->count) ? (int)$this->params->count : 0;
$type = isset($this->params->type) ? $this->params->type : 'all';
$pager = pager::init(0, $count, 1);
$programID = $this->view->block->module == 'my' ? 0 : (int)$this->session->program;
$this->view->projectStats = $this->loadModel('project')->getProjectStats($type, $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'order_desc', $this->viewType != 'json' ? $pager : '', $programID);
@@ -1707,10 +1715,10 @@ class block extends control
{
$this->loadModel('project');
$num = isset($this->params->num) ? (int)$this->params->num : 15;
$count = isset($this->params->count) ? (int)$this->params->count : 15;
/* Get projects. */
$this->view->programs = $this->loadModel('program')->getProgramOverview('byStatus', 'doing', 'id_desc', $num);
$this->view->programs = $this->loadModel('program')->getProgramOverview('byStatus', 'doing', 'id_desc', $count);
}
/**
module/block/lang/de.php
+16 -16
View File
@@ -75,8 +75,8 @@ $lang->block->default['product']['1']['title'] = $lang->productCommon . ' Berich
$lang->block->default['product']['1']['block'] = 'statistic';
$lang->block->default['product']['1']['grid'] = 8;
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['num'] = 5;
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['count'] = 5;
$lang->block->default['product']['2']['title'] = $lang->productCommon . ' Übersicht';
$lang->block->default['product']['2']['block'] = 'overview';
@@ -86,14 +86,14 @@ $lang->block->default['product']['3']['title'] = 'Offene ' . $lang->productCommo
$lang->block->default['product']['3']['block'] = 'list';
$lang->block->default['product']['3']['grid'] = 8;
$lang->block->default['product']['3']['params']['num'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['3']['params']['count'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['4']['title'] = 'Meine Story';
$lang->block->default['product']['4']['block'] = 'story';
$lang->block->default['product']['4']['grid'] = 4;
$lang->block->default['product']['4']['params']['num'] = 15;
$lang->block->default['product']['4']['params']['count'] = 15;
$lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['product']['4']['params']['type'] = 'assignedTo';
@@ -101,8 +101,8 @@ $lang->block->default['project']['1']['title'] = $lang->projectCommon . ' Berich
$lang->block->default['project']['1']['block'] = 'statistic';
$lang->block->default['project']['1']['grid'] = 8;
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['num'] = 5;
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['count'] = 5;
$lang->block->default['project']['2']['title'] = $lang->projectCommon . ' Übersicht';
$lang->block->default['project']['2']['block'] = 'overview';
@@ -112,7 +112,7 @@ $lang->block->default['project']['3']['title'] = 'Aktive ' . $lang->projectCommo
$lang->block->default['project']['3']['block'] = 'list';
$lang->block->default['project']['3']['grid'] = 8;
$lang->block->default['project']['3']['params']['num'] = 15;
$lang->block->default['project']['3']['params']['count'] = 15;
$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['3']['params']['type'] = 'undone';
@@ -120,7 +120,7 @@ $lang->block->default['project']['4']['title'] = 'Meine Aufgaben';
$lang->block->default['project']['4']['block'] = 'task';
$lang->block->default['project']['4']['grid'] = 4;
$lang->block->default['project']['4']['params']['num'] = 15;
$lang->block->default['project']['4']['params']['count'] = 15;
$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['4']['params']['type'] = 'assignedTo';
@@ -128,8 +128,8 @@ $lang->block->default['qa']['1']['title'] = 'Test Report';
$lang->block->default['qa']['1']['block'] = 'statistic';
$lang->block->default['qa']['1']['grid'] = 8;
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['num'] = '20';
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['count'] = '20';
//$lang->block->default['qa']['2']['title'] = 'Testcase Overview';
//$lang->block->default['qa']['2']['block'] = 'overview';
@@ -139,7 +139,7 @@ $lang->block->default['qa']['2']['title'] = 'Meine Bugs';
$lang->block->default['qa']['2']['block'] = 'bug';
$lang->block->default['qa']['2']['grid'] = 4;
$lang->block->default['qa']['2']['params']['num'] = 15;
$lang->block->default['qa']['2']['params']['count'] = 15;
$lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['2']['params']['type'] = 'assignedTo';
@@ -147,7 +147,7 @@ $lang->block->default['qa']['3']['title'] = 'My Case';
$lang->block->default['qa']['3']['block'] = 'case';
$lang->block->default['qa']['3']['grid'] = 4;
$lang->block->default['qa']['3']['params']['num'] = 15;
$lang->block->default['qa']['3']['params']['count'] = 15;
$lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['3']['params']['type'] = 'assigntome';
@@ -155,7 +155,7 @@ $lang->block->default['qa']['4']['title'] = 'Ausstehende Builds';
$lang->block->default['qa']['4']['block'] = 'testtask';
$lang->block->default['qa']['4']['grid'] = 4;
$lang->block->default['qa']['4']['params']['num'] = 15;
$lang->block->default['qa']['4']['params']['count'] = 15;
$lang->block->default['qa']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['4']['params']['type'] = 'wait';
@@ -175,7 +175,7 @@ $lang->block->default['full']['my']['4']['title'] = 'Meine Todos';
$lang->block->default['full']['my']['4']['block'] = 'list';
$lang->block->default['full']['my']['4']['grid'] = 4;
$lang->block->default['full']['my']['4']['source'] = 'todo';
$lang->block->default['full']['my']['4']['params']['num'] = '20';
$lang->block->default['full']['my']['4']['params']['count'] = '20';
$lang->block->default['full']['my']['5'] = $lang->block->default['project']['1'];
$lang->block->default['full']['my']['5']['source'] = 'project';
$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2'];
@@ -187,7 +187,7 @@ $lang->block->default['full']['my']['8']['source'] = 'product';
$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2'];
$lang->block->default['full']['my']['9']['source'] = 'qa';
$lang->block->num = 'Number';
$lang->block->count = 'Count';
$lang->block->type = 'Type';
$lang->block->orderBy = 'Order by';
module/block/lang/en.php
+21 -21
View File
@@ -111,7 +111,7 @@ $lang->block->default['waterfall']['program']['5']['source'] = 'program';
$lang->block->default['waterfall']['program']['5']['grid'] = 8;
$lang->block->default['waterfall']['program']['5']['params']['type'] = 'all';
$lang->block->default['waterfall']['program']['5']['params']['num'] = '15';
$lang->block->default['waterfall']['program']['5']['params']['count'] = '15';
$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc';
$lang->block->default['waterfall']['program']['6']['title'] = 'Dynamic';
@@ -125,7 +125,7 @@ $lang->block->default['waterfall']['program']['7']['source'] = 'program';
$lang->block->default['waterfall']['program']['7']['grid'] = 8;
$lang->block->default['waterfall']['program']['7']['params']['type'] = 'all';
$lang->block->default['waterfall']['program']['7']['params']['num'] = '15';
$lang->block->default['waterfall']['program']['7']['params']['count'] = '15';
$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc';
$lang->block->default['scrum']['program']['1']['title'] = $lang->projectCommon . ' Overall';
@@ -145,7 +145,7 @@ $lang->block->default['scrum']['program']['4']['block'] = 'scrumtest';
$lang->block->default['scrum']['program']['4']['grid'] = 8;
$lang->block->default['scrum']['program']['4']['params']['type'] = 'all';
$lang->block->default['scrum']['program']['4']['params']['num'] = '15';
$lang->block->default['scrum']['program']['4']['params']['count'] = '15';
$lang->block->default['scrum']['program']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['scrum']['program']['5']['title'] = $lang->productCommon . ' Overview';
@@ -164,8 +164,8 @@ $lang->block->default['product']['1']['title'] = $lang->productCommon . ' Report
$lang->block->default['product']['1']['block'] = 'statistic';
$lang->block->default['product']['1']['grid'] = 8;
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['num'] = '20';
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['count'] = '20';
$lang->block->default['product']['2']['title'] = $lang->productCommon . ' Overview';
$lang->block->default['product']['2']['block'] = 'overview';
@@ -175,14 +175,14 @@ $lang->block->default['product']['3']['title'] = 'Active ' . $lang->productCommo
$lang->block->default['product']['3']['block'] = 'list';
$lang->block->default['product']['3']['grid'] = 8;
$lang->block->default['product']['3']['params']['num'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['3']['params']['count'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['4']['title'] = 'My Stories';
$lang->block->default['product']['4']['block'] = 'story';
$lang->block->default['product']['4']['grid'] = 4;
$lang->block->default['product']['4']['params']['num'] = 15;
$lang->block->default['product']['4']['params']['count'] = 15;
$lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['product']['4']['params']['type'] = 'assignedTo';
@@ -190,8 +190,8 @@ $lang->block->default['project']['1']['title'] = $lang->projectCommon . ' Report
$lang->block->default['project']['1']['block'] = 'statistic';
$lang->block->default['project']['1']['grid'] = 8;
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['num'] = '20';
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['count'] = '20';
$lang->block->default['project']['2']['title'] = $lang->projectCommon . ' Overview';
$lang->block->default['project']['2']['block'] = 'overview';
@@ -201,7 +201,7 @@ $lang->block->default['project']['3']['title'] = 'Active ' . $lang->projectCommo
$lang->block->default['project']['3']['block'] = 'list';
$lang->block->default['project']['3']['grid'] = 8;
$lang->block->default['project']['3']['params']['num'] = 15;
$lang->block->default['project']['3']['params']['count'] = 15;
$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['3']['params']['type'] = 'undone';
@@ -209,7 +209,7 @@ $lang->block->default['project']['4']['title'] = 'My Tasks';
$lang->block->default['project']['4']['block'] = 'task';
$lang->block->default['project']['4']['grid'] = 4;
$lang->block->default['project']['4']['params']['num'] = 15;
$lang->block->default['project']['4']['params']['count'] = 15;
$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['4']['params']['type'] = 'assignedTo';
@@ -217,8 +217,8 @@ $lang->block->default['qa']['1']['title'] = 'Test Report';
$lang->block->default['qa']['1']['block'] = 'statistic';
$lang->block->default['qa']['1']['grid'] = 8;
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['num'] = '20';
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['count'] = '20';
//$lang->block->default['qa']['2']['title'] = 'Testcase Overview';
//$lang->block->default['qa']['2']['block'] = 'overview';
@@ -228,7 +228,7 @@ $lang->block->default['qa']['2']['title'] = 'My Bugs';
$lang->block->default['qa']['2']['block'] = 'bug';
$lang->block->default['qa']['2']['grid'] = 4;
$lang->block->default['qa']['2']['params']['num'] = 15;
$lang->block->default['qa']['2']['params']['count'] = 15;
$lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['2']['params']['type'] = 'assignedTo';
@@ -236,7 +236,7 @@ $lang->block->default['qa']['3']['title'] = 'My Cases';
$lang->block->default['qa']['3']['block'] = 'case';
$lang->block->default['qa']['3']['grid'] = 4;
$lang->block->default['qa']['3']['params']['num'] = 15;
$lang->block->default['qa']['3']['params']['count'] = 15;
$lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['3']['params']['type'] = 'assigntome';
@@ -244,7 +244,7 @@ $lang->block->default['qa']['4']['title'] = 'Waiting Builds';
$lang->block->default['qa']['4']['block'] = 'testtask';
$lang->block->default['qa']['4']['grid'] = 4;
$lang->block->default['qa']['4']['params']['num'] = 15;
$lang->block->default['qa']['4']['params']['count'] = 15;
$lang->block->default['qa']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['4']['params']['type'] = 'wait';
@@ -262,7 +262,7 @@ $lang->block->default['full']['my']['3']['title'] = 'My Todos';
$lang->block->default['full']['my']['3']['block'] = 'list';
$lang->block->default['full']['my']['3']['grid'] = 4;
$lang->block->default['full']['my']['3']['source'] = 'todo';
$lang->block->default['full']['my']['3']['params']['num'] = '20';
$lang->block->default['full']['my']['3']['params']['count'] = '20';
$lang->block->default['full']['my']['4']['title'] = $lang->projectCommon . ' Statistic';
$lang->block->default['full']['my']['4']['block'] = 'statistic';
@@ -284,7 +284,7 @@ $lang->block->default['full']['my']['7']['block'] = 'task';
$lang->block->default['full']['my']['7']['grid'] = 4;
$lang->block->default['full']['my']['7']['params']['orderBy'] = 'id_desc';
$lang->block->default['full']['my']['7']['params']['num'] = '15';
$lang->block->default['full']['my']['7']['params']['count'] = '15';
$lang->block->default['full']['my']['7']['params']['type'] = 'assignedTo';
$lang->block->default['full']['my']['8']['title'] = 'Human Input';
@@ -297,9 +297,9 @@ $lang->block->default['full']['my']['9']['source'] = 'program';
$lang->block->default['full']['my']['9']['grid'] = 8;
$lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
$lang->block->default['full']['my']['9']['params']['num'] = '15';
$lang->block->default['full']['my']['9']['params']['count'] = '15';
$lang->block->num = 'Number';
$lang->block->count = 'Count';
$lang->block->type = 'Type';
$lang->block->orderBy = 'Order by';
module/block/lang/fr.php
+16 -16
View File
@@ -75,8 +75,8 @@ $lang->block->default['product']['1']['title'] = ' Rapport de ' . $lang->product
$lang->block->default['product']['1']['block'] = 'statistic';
$lang->block->default['product']['1']['grid'] = 8;
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['num'] = '20';
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['count'] = '20';
$lang->block->default['product']['2']['title'] = "Vue d'ensemble du " . $lang->productCommon;
$lang->block->default['product']['2']['block'] = 'overview';
@@ -86,14 +86,14 @@ $lang->block->default['product']['3']['title'] = $lang->productCommon . 's Actif
$lang->block->default['product']['3']['block'] = 'list';
$lang->block->default['product']['3']['grid'] = 8;
$lang->block->default['product']['3']['params']['num'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['3']['params']['count'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['4']['title'] = 'Mes Stories';
$lang->block->default['product']['4']['block'] = 'story';
$lang->block->default['product']['4']['grid'] = 4;
$lang->block->default['product']['4']['params']['num'] = 15;
$lang->block->default['product']['4']['params']['count'] = 15;
$lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['product']['4']['params']['type'] = 'assignedTo';
@@ -101,8 +101,8 @@ $lang->block->default['project']['1']['title'] = 'Rapport de ' . $lang->projectC
$lang->block->default['project']['1']['block'] = 'statistic';
$lang->block->default['project']['1']['grid'] = 8;
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['num'] = '20';
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['count'] = '20';
$lang->block->default['project']['2']['title'] = "Vue d'ensemble du " . $lang->projectCommon;
$lang->block->default['project']['2']['block'] = 'overview';
@@ -112,7 +112,7 @@ $lang->block->default['project']['3']['title'] = $lang->projectCommon . 's Actif
$lang->block->default['project']['3']['block'] = 'list';
$lang->block->default['project']['3']['grid'] = 8;
$lang->block->default['project']['3']['params']['num'] = 15;
$lang->block->default['project']['3']['params']['count'] = 15;
$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['3']['params']['type'] = 'undone';
@@ -120,7 +120,7 @@ $lang->block->default['project']['4']['title'] = 'Mes Tâches';
$lang->block->default['project']['4']['block'] = 'task';
$lang->block->default['project']['4']['grid'] = 4;
$lang->block->default['project']['4']['params']['num'] = 15;
$lang->block->default['project']['4']['params']['count'] = 15;
$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['4']['params']['type'] = 'assignedTo';
@@ -128,8 +128,8 @@ $lang->block->default['qa']['1']['title'] = 'Rapport de Tests';
$lang->block->default['qa']['1']['block'] = 'statistic';
$lang->block->default['qa']['1']['grid'] = 8;
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['num'] = '20';
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['count'] = '20';
//$lang->block->default['qa']['2']['title'] = 'Testcase Overview';
//$lang->block->default['qa']['2']['block'] = 'overview';
@@ -139,7 +139,7 @@ $lang->block->default['qa']['2']['title'] = 'Mes Bugs';
$lang->block->default['qa']['2']['block'] = 'bug';
$lang->block->default['qa']['2']['grid'] = 4;
$lang->block->default['qa']['2']['params']['num'] = 15;
$lang->block->default['qa']['2']['params']['count'] = 15;
$lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['2']['params']['type'] = 'assignedTo';
@@ -147,7 +147,7 @@ $lang->block->default['qa']['3']['title'] = 'Mes CasTests';
$lang->block->default['qa']['3']['block'] = 'case';
$lang->block->default['qa']['3']['grid'] = 4;
$lang->block->default['qa']['3']['params']['num'] = 15;
$lang->block->default['qa']['3']['params']['count'] = 15;
$lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['3']['params']['type'] = 'assigntome';
@@ -155,7 +155,7 @@ $lang->block->default['qa']['4']['title'] = 'Builds en attente';
$lang->block->default['qa']['4']['block'] = 'testtask';
$lang->block->default['qa']['4']['grid'] = 4;
$lang->block->default['qa']['4']['params']['num'] = 15;
$lang->block->default['qa']['4']['params']['count'] = 15;
$lang->block->default['qa']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['4']['params']['type'] = 'wait';
@@ -175,7 +175,7 @@ $lang->block->default['full']['my']['4']['title'] = 'Mon Agenda';
$lang->block->default['full']['my']['4']['block'] = 'list';
$lang->block->default['full']['my']['4']['grid'] = 4;
$lang->block->default['full']['my']['4']['source'] = 'todo';
$lang->block->default['full']['my']['4']['params']['num'] = '20';
$lang->block->default['full']['my']['4']['params']['count'] = '20';
$lang->block->default['full']['my']['5'] = $lang->block->default['project']['1'];
$lang->block->default['full']['my']['5']['source'] = 'project';
$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2'];
@@ -187,7 +187,7 @@ $lang->block->default['full']['my']['8']['source'] = 'product';
$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2'];
$lang->block->default['full']['my']['9']['source'] = 'qa';
$lang->block->num = 'Numéro';
$lang->block->count = 'Numéro';
$lang->block->type = 'Type';
$lang->block->orderBy = 'Trié par';
module/block/lang/vi.php
+17 -17
View File
@@ -75,8 +75,8 @@ $lang->block->default['product']['1']['title'] = 'Báo cáo '.$lang->productComm
$lang->block->default['product']['1']['block'] = 'statistic';
$lang->block->default['product']['1']['grid'] = 8;
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['num'] = '20';
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['count'] = '20';
$lang->block->default['product']['2']['title'] = 'Tổng quan '.$lang->productCommon;
$lang->block->default['product']['2']['block'] = 'overview';
@@ -86,23 +86,23 @@ $lang->block->default['product']['3']['title'] = 'Kích hoạt ' . $lang->produc
$lang->block->default['product']['3']['block'] = 'list';
$lang->block->default['product']['3']['grid'] = 8;
$lang->block->default['product']['3']['params']['num'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['3']['params']['count'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['4']['title'] = 'Câu chuyện của bạn';
$lang->block->default['product']['4']['block'] = 'story';
$lang->block->default['product']['4']['grid'] = 4;
$lang->block->default['product']['4']['params']['num'] = 15;
$lang->block->default['product']['4']['params']['count'] = 15;
$lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['product']['4']['params']['type'] = 'assignedTo';
$lang->block->default['product']['4']['params']['type'] = 'assignedTo';
$lang->block->default['project']['1']['title'] = 'Báo cáo '.$lang->projectCommon;
$lang->block->default['project']['1']['block'] = 'statistic';
$lang->block->default['project']['1']['grid'] = 8;
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['num'] = '20';
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['count'] = '20';
$lang->block->default['project']['2']['title'] = 'Tổng quan '.$lang->projectCommon ;
$lang->block->default['project']['2']['block'] = 'overview';
@@ -112,7 +112,7 @@ $lang->block->default['project']['3']['title'] = 'Kích hoạt ' . $lang->projec
$lang->block->default['project']['3']['block'] = 'list';
$lang->block->default['project']['3']['grid'] = 8;
$lang->block->default['project']['3']['params']['num'] = 15;
$lang->block->default['project']['3']['params']['count'] = 15;
$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['3']['params']['type'] = 'undone';
@@ -120,7 +120,7 @@ $lang->block->default['project']['4']['title'] = 'Nhiệm vụ';
$lang->block->default['project']['4']['block'] = 'task';
$lang->block->default['project']['4']['grid'] = 4;
$lang->block->default['project']['4']['params']['num'] = 15;
$lang->block->default['project']['4']['params']['count'] = 15;
$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['4']['params']['type'] = 'assignedTo';
@@ -128,8 +128,8 @@ $lang->block->default['qa']['1']['title'] = 'Báo cáo Test';
$lang->block->default['qa']['1']['block'] = 'statistic';
$lang->block->default['qa']['1']['grid'] = 8;
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['num'] = '20';
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['count'] = '20';
//$lang->block->default['qa']['2']['title'] = 'Testcase Overview';
//$lang->block->default['qa']['2']['block'] = 'overview';
@@ -139,7 +139,7 @@ $lang->block->default['qa']['2']['title'] = 'Bugs của bạn';
$lang->block->default['qa']['2']['block'] = 'bug';
$lang->block->default['qa']['2']['grid'] = 4;
$lang->block->default['qa']['2']['params']['num'] = 15;
$lang->block->default['qa']['2']['params']['count'] = 15;
$lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['2']['params']['type'] = 'assignedTo';
@@ -147,7 +147,7 @@ $lang->block->default['qa']['3']['title'] = 'Tình huống của bạn';
$lang->block->default['qa']['3']['block'] = 'case';
$lang->block->default['qa']['3']['grid'] = 4;
$lang->block->default['qa']['3']['params']['num'] = 15;
$lang->block->default['qa']['3']['params']['count'] = 15;
$lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['3']['params']['type'] = 'assigntome';
@@ -155,7 +155,7 @@ $lang->block->default['qa']['4']['title'] = 'Đang đợi bản dựng';
$lang->block->default['qa']['4']['block'] = 'testtask';
$lang->block->default['qa']['4']['grid'] = 4;
$lang->block->default['qa']['4']['params']['num'] = 15;
$lang->block->default['qa']['4']['params']['count'] = 15;
$lang->block->default['qa']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['4']['params']['type'] = 'wait';
@@ -175,7 +175,7 @@ $lang->block->default['full']['my']['4']['title'] = 'Việc của bạn'
$lang->block->default['full']['my']['4']['block'] = 'list';
$lang->block->default['full']['my']['4']['grid'] = 4;
$lang->block->default['full']['my']['4']['source'] = 'todo';
$lang->block->default['full']['my']['4']['params']['num'] = '20';
$lang->block->default['full']['my']['4']['params']['count'] = '20';
$lang->block->default['full']['my']['5'] = $lang->block->default['project']['1'];
$lang->block->default['full']['my']['5']['source'] = 'project';
$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2'];
@@ -187,7 +187,7 @@ $lang->block->default['full']['my']['8']['source'] = 'product';
$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2'];
$lang->block->default['full']['my']['9']['source'] = 'qa';
$lang->block->num = 'Số';
$lang->block->count = 'Số';
$lang->block->type = 'Loại';
$lang->block->orderBy = 'Order by';
module/block/lang/zh-cn.php
+21 -21
View File
@@ -118,7 +118,7 @@ $lang->block->default['waterfall']['program']['5']['source'] = 'program';
$lang->block->default['waterfall']['program']['5']['grid'] = 8;
$lang->block->default['waterfall']['program']['5']['params']['type'] = 'all';
$lang->block->default['waterfall']['program']['5']['params']['num'] = '15';
$lang->block->default['waterfall']['program']['5']['params']['count'] = '15';
$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc';
$lang->block->default['waterfall']['program']['6']['title'] = '最新动态';
@@ -132,7 +132,7 @@ $lang->block->default['waterfall']['program']['7']['source'] = 'program';
$lang->block->default['waterfall']['program']['7']['grid'] = 8;
$lang->block->default['waterfall']['program']['7']['params']['type'] = 'all';
$lang->block->default['waterfall']['program']['7']['params']['num'] = '15';
$lang->block->default['waterfall']['program']['7']['params']['count'] = '15';
$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc';
$lang->block->default['scrum']['program']['1']['title'] = '项目整体情况';
@@ -152,7 +152,7 @@ $lang->block->default['scrum']['program']['4']['block'] = 'scrumtest';
$lang->block->default['scrum']['program']['4']['grid'] = 8;
$lang->block->default['scrum']['program']['4']['params']['type'] = 'all';
$lang->block->default['scrum']['program']['4']['params']['num'] = '15';
$lang->block->default['scrum']['program']['4']['params']['count'] = '15';
$lang->block->default['scrum']['program']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['scrum']['program']['5']['title'] = $lang->productCommon . '总览';
@@ -171,8 +171,8 @@ $lang->block->default['product']['1']['title'] = $lang->productCommon . '统计'
$lang->block->default['product']['1']['block'] = 'statistic';
$lang->block->default['product']['1']['grid'] = 8;
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['num'] = '20';
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['count'] = '20';
$lang->block->default['product']['2']['title'] = $lang->productCommon . '总览';
$lang->block->default['product']['2']['block'] = 'overview';
@@ -182,14 +182,14 @@ $lang->block->default['product']['3']['title'] = '未关闭的' . $lang->product
$lang->block->default['product']['3']['block'] = 'list';
$lang->block->default['product']['3']['grid'] = 8;
$lang->block->default['product']['3']['params']['num'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['3']['params']['count'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['4']['title'] = "指派给我的{$lang->storyCommon}";
$lang->block->default['product']['4']['block'] = 'story';
$lang->block->default['product']['4']['grid'] = 4;
$lang->block->default['product']['4']['params']['num'] = 15;
$lang->block->default['product']['4']['params']['count'] = 15;
$lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['product']['4']['params']['type'] = 'assignedTo';
@@ -197,8 +197,8 @@ $lang->block->default['project']['1']['title'] = $lang->projectCommon . '统计'
$lang->block->default['project']['1']['block'] = 'statistic';
$lang->block->default['project']['1']['grid'] = 8;
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['num'] = '20';
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['count'] = '20';
$lang->block->default['project']['2']['title'] = $lang->projectCommon . '总览';
$lang->block->default['project']['2']['block'] = 'overview';
@@ -208,7 +208,7 @@ $lang->block->default['project']['3']['title'] = '未关闭的' . $lang->project
$lang->block->default['project']['3']['block'] = 'list';
$lang->block->default['project']['3']['grid'] = 8;
$lang->block->default['project']['3']['params']['num'] = 15;
$lang->block->default['project']['3']['params']['count'] = 15;
$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['3']['params']['type'] = 'undone';
@@ -216,7 +216,7 @@ $lang->block->default['project']['4']['title'] = '指派给我的任务';
$lang->block->default['project']['4']['block'] = 'task';
$lang->block->default['project']['4']['grid'] = 4;
$lang->block->default['project']['4']['params']['num'] = 15;
$lang->block->default['project']['4']['params']['count'] = 15;
$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['4']['params']['type'] = 'assignedTo';
@@ -224,8 +224,8 @@ $lang->block->default['qa']['1']['title'] = '测试统计';
$lang->block->default['qa']['1']['block'] = 'statistic';
$lang->block->default['qa']['1']['grid'] = 8;
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['num'] = '20';
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['count'] = '20';
//$lang->block->default['qa']['2']['title'] = '测试用例总览';
//$lang->block->default['qa']['2']['block'] = 'overview';
@@ -235,7 +235,7 @@ $lang->block->default['qa']['2']['title'] = '指派给我的Bug';
$lang->block->default['qa']['2']['block'] = 'bug';
$lang->block->default['qa']['2']['grid'] = 4;
$lang->block->default['qa']['2']['params']['num'] = 15;
$lang->block->default['qa']['2']['params']['count'] = 15;
$lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['2']['params']['type'] = 'assignedTo';
@@ -243,7 +243,7 @@ $lang->block->default['qa']['3']['title'] = '指派给我的用例';
$lang->block->default['qa']['3']['block'] = 'case';
$lang->block->default['qa']['3']['grid'] = 4;
$lang->block->default['qa']['3']['params']['num'] = 15;
$lang->block->default['qa']['3']['params']['count'] = 15;
$lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['3']['params']['type'] = 'assigntome';
@@ -251,7 +251,7 @@ $lang->block->default['qa']['4']['title'] = '待测版本列表';
$lang->block->default['qa']['4']['block'] = 'testtask';
$lang->block->default['qa']['4']['grid'] = 8;
$lang->block->default['qa']['4']['params']['num'] = 15;
$lang->block->default['qa']['4']['params']['count'] = 15;
$lang->block->default['qa']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['4']['params']['type'] = 'wait';
@@ -269,7 +269,7 @@ $lang->block->default['full']['my']['3']['title'] = '我的待办';
$lang->block->default['full']['my']['3']['block'] = 'list';
$lang->block->default['full']['my']['3']['grid'] = 4;
$lang->block->default['full']['my']['3']['source'] = 'todo';
$lang->block->default['full']['my']['3']['params']['num'] = '20';
$lang->block->default['full']['my']['3']['params']['count'] = '20';
$lang->block->default['full']['my']['4']['title'] = '项目统计';
$lang->block->default['full']['my']['4']['block'] = 'statistic';
@@ -291,7 +291,7 @@ $lang->block->default['full']['my']['7']['block'] = 'task';
$lang->block->default['full']['my']['7']['grid'] = 4;
$lang->block->default['full']['my']['7']['params']['orderBy'] = 'id_desc';
$lang->block->default['full']['my']['7']['params']['num'] = '15';
$lang->block->default['full']['my']['7']['params']['count'] = '15';
$lang->block->default['full']['my']['7']['params']['type'] = 'assignedTo';
$lang->block->default['full']['my']['8']['title'] = '项目人力投入';
@@ -304,9 +304,9 @@ $lang->block->default['full']['my']['9']['source'] = 'program';
$lang->block->default['full']['my']['9']['grid'] = 8;
$lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
$lang->block->default['full']['my']['9']['params']['num'] = '15';
$lang->block->default['full']['my']['9']['params']['count'] = '15';
$lang->block->num = '数量';
$lang->block->count = '数量';
$lang->block->type = '类型';
$lang->block->orderBy = '排序';
module/block/lang/zh-tw.php
+12 -12
View File
@@ -76,7 +76,7 @@ $lang->block->default['product']['1']['block'] = 'statistic';
$lang->block->default['product']['1']['grid'] = 8;
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['num'] = '20';
$lang->block->default['product']['1']['params']['count'] = '20';
$lang->block->default['product']['2']['title'] = $lang->productCommon . '總覽';
$lang->block->default['product']['2']['block'] = 'overview';
@@ -86,14 +86,14 @@ $lang->block->default['product']['3']['title'] = '未關閉的' . $lang->product
$lang->block->default['product']['3']['block'] = 'list';
$lang->block->default['product']['3']['grid'] = 8;
$lang->block->default['product']['3']['params']['num'] = 15;
$lang->block->default['product']['3']['params']['count'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
$lang->block->default['product']['4']['title'] = "指派給我的{$lang->storyCommon}";
$lang->block->default['product']['4']['block'] = 'story';
$lang->block->default['product']['4']['grid'] = 4;
$lang->block->default['product']['4']['params']['num'] = 15;
$lang->block->default['product']['4']['params']['count'] = 15;
$lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['product']['4']['params']['type'] = 'assignedTo';
@@ -102,7 +102,7 @@ $lang->block->default['project']['1']['block'] = 'statistic';
$lang->block->default['project']['1']['grid'] = 8;
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['num'] = '20';
$lang->block->default['project']['1']['params']['count'] = '20';
$lang->block->default['project']['2']['title'] = $lang->projectCommon . '總覽';
$lang->block->default['project']['2']['block'] = 'overview';
@@ -112,7 +112,7 @@ $lang->block->default['project']['3']['title'] = '未關閉的' . $lang->project
$lang->block->default['project']['3']['block'] = 'list';
$lang->block->default['project']['3']['grid'] = 8;
$lang->block->default['project']['3']['params']['num'] = 15;
$lang->block->default['project']['3']['params']['count'] = 15;
$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['3']['params']['type'] = 'undone';
@@ -120,7 +120,7 @@ $lang->block->default['project']['4']['title'] = '指派給我的任務';
$lang->block->default['project']['4']['block'] = 'task';
$lang->block->default['project']['4']['grid'] = 4;
$lang->block->default['project']['4']['params']['num'] = 15;
$lang->block->default['project']['4']['params']['count'] = 15;
$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['4']['params']['type'] = 'assignedTo';
@@ -129,7 +129,7 @@ $lang->block->default['qa']['1']['block'] = 'statistic';
$lang->block->default['qa']['1']['grid'] = 8;
$lang->block->default['qa']['1']['params']['type'] = 'noclosed';
$lang->block->default['qa']['1']['params']['num'] = '20';
$lang->block->default['qa']['1']['params']['count'] = '20';
//$lang->block->default['qa']['2']['title'] = '測試用例總覽';
//$lang->block->default['qa']['2']['block'] = 'overview';
@@ -139,7 +139,7 @@ $lang->block->default['qa']['2']['title'] = '指派給我的Bug';
$lang->block->default['qa']['2']['block'] = 'bug';
$lang->block->default['qa']['2']['grid'] = 4;
$lang->block->default['qa']['2']['params']['num'] = 15;
$lang->block->default['qa']['2']['params']['count'] = 15;
$lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['2']['params']['type'] = 'assignedTo';
@@ -147,7 +147,7 @@ $lang->block->default['qa']['3']['title'] = '指派給我的用例';
$lang->block->default['qa']['3']['block'] = 'case';
$lang->block->default['qa']['3']['grid'] = 4;
$lang->block->default['qa']['3']['params']['num'] = 15;
$lang->block->default['qa']['3']['params']['count'] = 15;
$lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['3']['params']['type'] = 'assigntome';
@@ -155,7 +155,7 @@ $lang->block->default['qa']['4']['title'] = '待測版本列表';
$lang->block->default['qa']['4']['block'] = 'testtask';
$lang->block->default['qa']['4']['grid'] = 8;
$lang->block->default['qa']['4']['params']['num'] = 15;
$lang->block->default['qa']['4']['params']['count'] = 15;
$lang->block->default['qa']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['qa']['4']['params']['type'] = 'wait';
@@ -175,7 +175,7 @@ $lang->block->default['full']['my']['4']['title'] = '我的待辦';
$lang->block->default['full']['my']['4']['block'] = 'list';
$lang->block->default['full']['my']['4']['grid'] = 4;
$lang->block->default['full']['my']['4']['source'] = 'todo';
$lang->block->default['full']['my']['4']['params']['num'] = '20';
$lang->block->default['full']['my']['4']['params']['count'] = '20';
$lang->block->default['full']['my']['5'] = $lang->block->default['project']['1'];
$lang->block->default['full']['my']['5']['source'] = 'project';
$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2'];
@@ -187,7 +187,7 @@ $lang->block->default['full']['my']['8']['source'] = 'product';
$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2'];
$lang->block->default['full']['my']['9']['source'] = 'qa';
$lang->block->num = '數量';
$lang->block->count = '數量';
$lang->block->type = '類型';
$lang->block->orderBy = '排序';
module/block/model.php
+54 -54
View File
@@ -324,7 +324,7 @@ class blockModel extends model
if($module == 'project') return $this->getProjectParams($module);
$params = new stdclass();
$params = $this->onlyNumParams($params);
$params = $this->onlyCountParams($params);
return json_encode($params);
}
@@ -352,9 +352,9 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->task;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
$params->orderBy['name'] = $this->lang->block->orderBy;
$params->orderBy['default'] = 'id_desc';
@@ -377,9 +377,9 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->bug;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
$params->orderBy['name'] = $this->lang->block->orderBy;
$params->orderBy['default'] = 'id_desc';
@@ -402,9 +402,9 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->case;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
$params->orderBy['name'] = $this->lang->block->orderBy;
$params->orderBy['default'] = 'id_desc';
@@ -428,9 +428,9 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->testtask;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
return json_encode($params);
}
@@ -448,9 +448,9 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->story;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
$params->orderBy['name'] = $this->lang->block->orderBy;
$params->orderBy['default'] = 'id_desc';
@@ -468,7 +468,7 @@ class blockModel extends model
*/
public function getPlanParams()
{
$params = $this->onlyNumParams();
$params = $this->onlyCountParams();
return json_encode($params);
}
@@ -480,7 +480,7 @@ class blockModel extends model
*/
public function getReleaseParams()
{
$params = $this->onlyNumParams();
$params = $this->onlyCountParams();
return json_encode($params);
}
@@ -501,7 +501,7 @@ class blockModel extends model
$params->orderBy['options'] = $this->lang->block->orderByList->product;
$params->orderBy['control'] = 'select';
return json_encode($this->onlyNumParams($params));
return json_encode($this->onlyCountParams($params));
}
/**
@@ -512,7 +512,7 @@ class blockModel extends model
*/
public function getBuildParams()
{
$params = $this->onlyNumParams();
$params = $this->onlyCountParams();
return json_encode($params);
}
@@ -528,7 +528,7 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->product;
$params->type['control'] = 'select';
return json_encode($this->onlyNumParams($params));
return json_encode($this->onlyCountParams($params));
}
/**
@@ -544,7 +544,7 @@ class blockModel extends model
if($module == 'qa') return $this->getQaStatisticParams($module);
$params = new stdclass();
$params = $this->onlyNumParams($params);
$params = $this->onlyCountParams($params);
return json_encode($params);
}
@@ -561,8 +561,8 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->product;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['control'] = 'input';
return json_encode($params);
}
@@ -580,8 +580,8 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->project;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['control'] = 'input';
return json_encode($params);
}
@@ -599,8 +599,8 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->product;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['control'] = 'input';
return json_encode($params);
}
@@ -686,9 +686,9 @@ class blockModel extends model
$params->type['options'] = $this->lang->issue->labelList;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
$params->orderBy['name'] = $this->lang->block->orderBy;
$params->orderBy['options'] = $this->lang->block->orderByList->product;
@@ -712,9 +712,9 @@ class blockModel extends model
$params->type['options'] = $this->lang->risk->featureBar['browse'];
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
$params->orderBy['name'] = $this->lang->block->orderBy;
$params->orderBy['options'] = $this->lang->block->orderByList->product;
@@ -735,7 +735,7 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->project;
$params->type['control'] = 'select';
return json_encode($this->onlyNumParams($params));
return json_encode($this->onlyCountParams($params));
}
public function getAssignToMeParams()
@@ -794,18 +794,18 @@ class blockModel extends model
}
/**
* Build number params.
* Build count params.
*
* @param object $params
* @access public
* @return object
*/
public function onlyNumParams($params = '')
public function onlyCountParams($params = '')
{
if(empty($params)) $params = new stdclass();
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
return $params;
}
@@ -856,9 +856,9 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->testtask;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
return json_encode($params);
}
@@ -877,9 +877,9 @@ class blockModel extends model
$params->type['options'] = $this->lang->block->typeList->scrum;
$params->type['control'] = 'select';
$params->num['name'] = $this->lang->block->num;
$params->num['default'] = 20;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['default'] = 20;
$params->count['control'] = 'input';
return json_encode($params);
}
@@ -893,8 +893,8 @@ class blockModel extends model
*/
public function getScrumoverallParams($module = '')
{
$params->num['name'] = $this->lang->block->num;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['control'] = 'input';
return json_encode($params);
}
@@ -908,8 +908,8 @@ class blockModel extends model
*/
public function getScrumroadmapParams($module = '')
{
$params->num['name'] = $this->lang->block->num;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['control'] = 'input';
return json_encode($params);
}
@@ -923,8 +923,8 @@ class blockModel extends model
*/
public function getScrumproductParams($module = '')
{
$params->num['name'] = $this->lang->block->num;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['control'] = 'input';
return json_encode($params);
}
@@ -938,8 +938,8 @@ class blockModel extends model
*/
public function getScrumprojectParams($module = '')
{
$params->num['name'] = $this->lang->block->num;
$params->num['control'] = 'input';
$params->count['name'] = $this->lang->block->count;
$params->count['control'] = 'input';
return json_encode($params);
}