diff --git a/module/execution/config.php b/module/execution/config.php index c569d8ac16..ec4ef74386 100644 --- a/module/execution/config.php +++ b/module/execution/config.php @@ -7,7 +7,7 @@ $config->execution->weekend = '2'; $config->execution->ownerFields = array('PO', 'PM', 'QD', 'RD'); $config->execution->list = new stdclass(); -$config->execution->list->exportFields = 'id,name,code,PM,end,status,totalEstimate,totalConsumed,totalLeft,progress'; +$config->execution->list->exportFields = 'id,name,projectName,code,PM,end,status,totalEstimate,totalConsumed,totalLeft,progress'; $config->execution->modelList['scrum'] = 'sprint'; $config->execution->modelList['waterfall'] = 'stage'; diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 4d0a8a8d43..2d99e9baee 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -16,7 +16,7 @@ $lang->execution->id = $lang->executionCommon . ' ID'; $lang->execution->type = 'Typ'; $lang->execution->name = 'Name'; $lang->execution->code = 'Alias'; -$lang->execution->project = 'Project'; +$lang->execution->projectName = 'Project'; $lang->execution->execName = 'Execution Name'; $lang->execution->execCode = 'Execution Code'; $lang->execution->execType = 'Execution Type'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 1f5ecdef08..6006065bfc 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -16,7 +16,7 @@ $lang->execution->id = $lang->executionCommon . ' ID'; $lang->execution->type = $lang->executionCommon . 'Type'; $lang->execution->name = $lang->executionCommon . 'Name'; $lang->execution->code = $lang->executionCommon . 'Code'; -$lang->execution->project = 'Project'; +$lang->execution->projectName = 'Project'; $lang->execution->execName = 'Execution Name'; $lang->execution->execCode = 'Execution Code'; $lang->execution->execType = 'Execution Type'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 5d769daf4f..4c980ef16e 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -16,7 +16,7 @@ $lang->execution->id = $lang->executionCommon . ' ID'; $lang->execution->type = $lang->executionCommon . 'Type'; $lang->execution->name = $lang->executionCommon . 'Name'; $lang->execution->code = $lang->executionCommon . 'Code'; -$lang->execution->project = 'Project'; +$lang->execution->projectName = 'Project'; $lang->execution->execName = 'Execution Name'; $lang->execution->execCode = 'Execution Code'; $lang->execution->execType = 'Execution Type'; diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php index 865839cfd3..766a66f77f 100644 --- a/module/execution/lang/vi.php +++ b/module/execution/lang/vi.php @@ -16,7 +16,7 @@ $lang->execution->id = 'ID '.$lang->executionCommon; $lang->execution->type = 'Loại'; $lang->execution->name = "Tên {$lang->executionCommon}"; $lang->execution->code = 'Mã'; -$lang->execution->project = 'Project'; +$lang->execution->projectName = 'Project'; $lang->execution->execName = 'Execution Name'; $lang->execution->execCode = 'Execution Code'; $lang->execution->execType = 'Execution Type'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 5201ad72df..eed1188d4c 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -16,7 +16,7 @@ $lang->execution->id = $lang->executionCommon . '编号'; $lang->execution->type = $lang->executionCommon . '类型'; $lang->execution->name = $lang->executionCommon . '名称'; $lang->execution->code = $lang->executionCommon . '代号'; -$lang->execution->project = '所属项目'; +$lang->execution->projectName = '所属项目'; $lang->execution->execName = "{$lang->execution->common}名称"; $lang->execution->execCode = "{$lang->execution->common}代号"; $lang->execution->execType = "{$lang->execution->common}类型"; diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php index dc81251c32..d13a43b35f 100644 --- a/module/execution/lang/zh-tw.php +++ b/module/execution/lang/zh-tw.php @@ -16,7 +16,7 @@ $lang->execution->id = $lang->executionCommon . '編號'; $lang->execution->type = $lang->executionCommon . '類型'; $lang->execution->name = $lang->executionCommon . '名稱'; $lang->execution->code = $lang->executionCommon . '代號'; -$lang->execution->project = '所屬項目'; +$lang->execution->projectName = '所屬項目'; $lang->execution->execName = "{$lang->execution->common}名稱"; $lang->execution->execCode = "{$lang->execution->common}代號"; $lang->execution->execType = "{$lang->execution->common}類型"; diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index fcb588d108..4c46d38b2f 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -77,7 +77,7 @@ systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?> systemMode == 'new' and $this->app->tab == 'execution'):?> - execution->project);?> + execution->projectName);?> execution->owner);?> execution->execStatus : $lang->execution->status);?> diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php index 2402c3d1d9..2ad0a2b496 100755 --- a/module/execution/view/batchedit.html.php +++ b/module/execution/view/batchedit.html.php @@ -51,7 +51,7 @@ idAB;?> systemMode == 'new' and isset($project) and $project->model == 'scrum'):?> - execution->project;?> + execution->projectName;?> execution->$name;?> execution->$code;?> diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index a3785b1a47..86d5af042a 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -54,7 +54,7 @@ systemMode == 'new'):?> - + diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index eb78f42961..8c82adaac2 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -27,7 +27,7 @@
execution->project;?>execution->projectName;?>
systemMode == 'new'):?> - +
execution->project;?>execution->projectName;?> project, "class='form-control chosen' required");?>