-
block->allExecution;?>
+
block->allExecutions;?>
createLink('project', 'all', 'status=all')?>
total ? html::a($projectLink, $summary->total) : 0;?>
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 21512658d8..25b0d6f476 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = 'Vom Menü entfernen';
$lang->doc->search = 'Suche';
/* 查询条件列表 */
-$lang->doc->allProduct = 'Alle' . $lang->productCommon;
-$lang->doc->allProject = 'Alle' . $lang->executionCommon;
+$lang->doc->allProduct = 'Alle' . $lang->productCommon;
+$lang->doc->allExecutions = 'Alle' . $lang->executionCommon;
$lang->doc->libTypeList['product'] = $lang->productCommon . ' Bibliothek';
$lang->doc->libTypeList['execution'] = $lang->executionCommon . ' Bibliothek';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index a047068aea..4e75f43a7a 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = 'Remove from Menu';
$lang->doc->search = 'Search';
/* Query condition list. */
-$lang->doc->allProduct = 'All' . $lang->productCommon . 's';
-$lang->doc->allProject = 'All' . $lang->executionCommon . 's';
+$lang->doc->allProduct = 'All' . $lang->productCommon . 's';
+$lang->doc->allExecutions = 'All' . $lang->executionCommon . 's';
$lang->doc->libTypeList['product'] = $lang->productCommon . ' Library';
$lang->doc->libTypeList['execution'] = $lang->executionCommon . ' Library';
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index ff48ebc3dd..abbaf0d1a5 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = 'Décoller du Menu';
$lang->doc->search = 'Rechercher';
/* 查询条件列表 */
-$lang->doc->allProduct = 'Tous les ' . $lang->productCommon . 's';
-$lang->doc->allProject = 'Tous les ' . $lang->executionCommon . 's';
+$lang->doc->allProduct = 'Tous les' . $lang->productCommon . 's';
+$lang->doc->allExecutions = 'Tous les' . $lang->executionCommon . 's';
$lang->doc->libTypeList['product'] = $lang->productCommon . ' Library';
$lang->doc->libTypeList['execution'] = 'Bibliothèque ' . $lang->executionCommon;
diff --git a/module/doc/lang/vi.php b/module/doc/lang/vi.php
index b996268572..965490ac54 100644
--- a/module/doc/lang/vi.php
+++ b/module/doc/lang/vi.php
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = 'Remove from Menu';
$lang->doc->search = 'Tìm kiếm';
/* Query condition list. */
-$lang->doc->allProduct = 'All' . $lang->productCommon;
-$lang->doc->allProject = 'All' . $lang->executionCommon;
+$lang->doc->allProduct = 'All' . $lang->productCommon;
+$lang->doc->allExecutions = 'All' . $lang->executionCommon;
$lang->doc->libTypeList['product'] = $lang->productCommon . ' thư viện';
$lang->doc->libTypeList['execution'] = $lang->executionCommon . ' thư viện';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 1f76dfc40e..de5147e961 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = '从菜单栏移除';
$lang->doc->search = '搜索';
/* 查询条件列表 */
-$lang->doc->allProduct = '所有' . $lang->productCommon;
-$lang->doc->allExecution = '所有' . $lang->executionCommon;
+$lang->doc->allProduct = '所有' . $lang->productCommon;
+$lang->doc->allExecutions = '所有' . $lang->executionCommon;
$lang->doc->libTypeList['product'] = $lang->productCommon . '文档库';
$lang->doc->libTypeList['execution'] = $lang->executionCommon . '文档库';
diff --git a/module/doc/model.php b/module/doc/model.php
index 2e62a0a48c..ee94ecee22 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -780,7 +780,7 @@ class docModel extends model
$this->config->doc->search['actionURL'] = $actionURL;
$this->config->doc->search['queryID'] = $queryID;
$this->config->doc->search['params']['product']['values'] = array(''=>'') + $this->loadModel('product')->getPairs('nocode', $this->session->project) + array('all'=>$this->lang->doc->allProduct);
- $this->config->doc->search['params']['execution']['values'] = array(''=>'') + $this->loadModel('execution')->getPairs($this->session->project, 'all', 'noclosed') + array('all'=>$this->lang->doc->allExecution);
+ $this->config->doc->search['params']['execution']['values'] = array(''=>'') + $this->loadModel('execution')->getPairs($this->session->project, 'all', 'noclosed') + array('all'=>$this->lang->doc->allExecutions);
$this->config->doc->search['params']['lib']['values'] = array(''=>'', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
/* Get the modules. */
diff --git a/module/execution/control.php b/module/execution/control.php
index eb12d313c2..b28a7a554b 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2407,14 +2407,14 @@ class execution extends control
$this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted');
/* Assign. */
- $this->view->executionID = $executionID;
- $this->view->type = $type;
- $this->view->orderBy = $orderBy;
- $this->view->pager = $pager;
- $this->view->account = $account;
- $this->view->param = $param;
- $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
- $this->view->direction = $direction;
+ $this->view->executionID = $executionID;
+ $this->view->type = $type;
+ $this->view->orderBy = $orderBy;
+ $this->view->pager = $pager;
+ $this->view->account = $account;
+ $this->view->param = $param;
+ $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
+ $this->view->direction = $direction;
$this->display();
}
@@ -2498,14 +2498,14 @@ class execution extends control
*/
public function ajaxGetRecentExecutions()
{
- $allExecution = $this->execution->getRecentExecutions();
- if(!empty($allExecution))
+ $allExecutions = $this->execution->getRecentExecutions();
+ if(!empty($allExecutions))
{
- foreach($allExecution as $type => $executionList)
+ foreach($allExecutions as $type => $executionList)
{
echo '
'. $this->lang->execution->$type . '
';
$color = $type == 'recent' ? 'text-brown' : '';
- $executions = $allExecution[$type];
+ $executions = $allExecutions[$type];
$executionsName = array();
foreach($executions as $execution) $executionsName[] = $execution->name;
$executionsPinYin = common::convert2Pinyin($executionsName);
@@ -2602,8 +2602,8 @@ class execution extends control
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
- $this->view->title = $this->lang->execution->allExecution;
- $this->view->position[] = $this->lang->execution->allExecution;
+ $this->view->title = $this->lang->execution->allExecutions;
+ $this->view->position[] = $this->lang->execution->allExecutions;
$this->view->executionStats = $this->project->getStats($this->session->project, $status, $productID, 0, 30, $orderBy, $pager);
$this->view->products = array(0 => $this->lang->product->select) + $this->loadModel('product')->getProductPairsByProject($this->session->project);
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index d65443c926..96b7b8b0b6 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -12,7 +12,7 @@
/* 字段列表。*/
$lang->executionCommon = $lang->executionCommon;
$lang->execution->common = $lang->executionCommon . '视图';
-$lang->execution->allExecution = '所有' . $lang->executionCommon;
+$lang->execution->allExecutions = '所有' . $lang->executionCommon;
$lang->execution->id = $lang->executionCommon . '编号';
$lang->execution->type = $lang->executionCommon . '类型';
$lang->execution->name = $lang->executionCommon . '名称';
diff --git a/module/execution/model.php b/module/execution/model.php
index 1f938d23ea..5c4db327cb 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2846,7 +2846,7 @@ class executionModel extends model
{
$this->config->execution->search['actionURL'] = $actionURL;
$this->config->execution->search['queryID'] = $queryID;
- $this->config->execution->search['params']['execution']['values'] = array(''=>'', $executionID => $executions[$executionID], 'all' => $this->lang->execution->allExecution);
+ $this->config->execution->search['params']['execution']['values'] = array(''=>'', $executionID => $executions[$executionID], 'all' => $this->lang->execution->allExecutions);
$showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
$this->config->execution->search['params']['module']['values'] = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
@@ -3462,7 +3462,7 @@ class executionModel extends model
$productPairs = $this->getStageLinkProductPairs($stageIdList);
$recentExecutions = isset($this->config->execution->recentExecutions) ? explode(',', $this->config->execution->recentExecutions) : array();
- $allExecution = array('recent' => array(), 'mine' => array());
+ $allExecutions = array('recent' => array(), 'mine' => array());
foreach($executions as $execution)
{
if($execution->type == 'stage') $execution->name = zget($executionPairs, $execution->execution) . '/' . zget($productPairs, $execution->id) . '/' . $execution->name;
@@ -3470,14 +3470,14 @@ class executionModel extends model
if(in_array($execution->id, $recentExecutions))
{
$index = array_search($execution->id, $recentExecutions);
- $allExecution['recent'][$index] = $execution;
+ $allExecutions['recent'][$index] = $execution;
continue;
}
- $allExecution['mine'][] = $execution;
+ $allExecutions['mine'][] = $execution;
}
- ksort($allExecution['recent']);
- return $allExecution;
+ ksort($allExecutions['recent']);
+ return $allExecutions;
}
/**
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 76b5a8932b..d5a8873af1 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -564,7 +564,7 @@ $lang->resource->execution->printKanban = 'printKanbanAction';
$lang->resource->execution->tree = 'treeAction';
$lang->resource->execution->treeTask = 'treeOnlyTask';
$lang->resource->execution->treeStory = 'treeOnlyStory';
-$lang->resource->execution->all = 'allProjects';
+$lang->resource->execution->all = 'allExecutions';
$lang->resource->execution->kanbanHideCols = 'kanbanHideCols';
$lang->resource->execution->kanbanColsColor = 'kanbanColsColor';
$lang->resource->execution->export = 'exportAction';