diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 359d698891..00f346a769 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -72,6 +72,7 @@ $lang->api = new stdclass();
$lang->file = new stdclass();
$lang->misc = new stdclass();
+$lang->projectbuild = new stdclass();
$lang->projectrelease = new stdclass();
$lang->projectstory = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index aa0fc9cc2c..daa046908c 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -109,7 +109,7 @@ $lang->select = '选择';
$lang->selectAll = '全选';
$lang->selectReverse = '反选';
$lang->loading = '稍候...';
-$lang->notFound = '抱歉,您访问的对象并不存在!';
+$lang->notFound = '抱歉,您访问的对象不存在!';
$lang->notPage = '抱歉,您访问的功能正在开发中!';
$lang->showAll = '[[全部显示]]';
$lang->selectedItems = '已选择 {0} 项';
diff --git a/module/common/model.php b/module/common/model.php
index 142ed53a0f..69b99e5b76 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -314,7 +314,6 @@ class commonModel extends model
echo '' . html::a(helper::createLink('my', 'profile', '', '', true), " " . $lang->profile, '', "class='iframe' data-width='600'") . ' ';
echo '' . html::a(helper::createLink('my', 'preference', '', '', true), " " . $lang->preference, '', "class='iframe' data-width='650'") . ' ';
echo '' . html::a(helper::createLink('my', 'changepassword', '', '', true), " " . $lang->changePassword, '', "class='iframe' data-width='600'") . ' ';
- echo " $lang->unfoldMenu$lang->collapseMenu ";
echo "";
}
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 8d9a165e03..8084267eeb 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -11,10 +11,17 @@ include 'chosen.html.php';
{$app->openApp}->menu->$activeMenu) and isset($lang->{$app->openApp}->menu->{$activeMenu}['subMenu'])):?>
diff --git a/module/cron/view/create.html.php b/module/cron/view/create.html.php
index fc3b7a209d..afed61d995 100644
--- a/module/cron/view/create.html.php
+++ b/module/cron/view/create.html.php
@@ -11,9 +11,6 @@
*/
?>
-
- openApp);?>
+ openApp);?>
switcherMenu) ? $lang->switcherMenu : '';?>
+
+
+
+
+
-
-
diff --git a/module/cron/view/edit.html.php b/module/cron/view/edit.html.php
index a9e0ec185c..24b6207096 100644
--- a/module/cron/view/edit.html.php
+++ b/module/cron/view/edit.html.php
@@ -11,9 +11,6 @@
*/
?>
-
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index c2402101a9..fc0872121a 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -34,7 +34,7 @@
idAB;?>
my->name;?>
- my->project;?>
+ my->projects;?>
execution->begin;?>
execution->end;?>
statusAB;?>
diff --git a/module/personnel/view/accessible.html.php b/module/personnel/view/accessible.html.php
index 538e08c971..d06bcb048a 100644
--- a/module/personnel/view/accessible.html.php
+++ b/module/personnel/view/accessible.html.php
@@ -35,8 +35,8 @@ js::set('deptID', $deptID);
-
-
diff --git a/module/custom/control.php b/module/custom/control.php
index c3ce006d2f..00b5a84737 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -19,7 +19,11 @@ class custom extends control
*/
public function index()
{
- if(common::hasPriv('custom', 'set')) die(js::locate(inlink('set', "module=project&field=" . key($this->lang->custom->project->fields))));
+ if(($this->config->systemMode == 'new') and common::hasPriv('custom', 'set'))
+ {
+ die(js::locate(inlink('set', "module=project&field=" . key($this->lang->custom->project->fields))));
+ }
+
if(common::hasPriv('custom', 'product')) die(js::locate(inlink('product')));
if(common::hasPriv('custom', 'execution')) die(js::locate(inlink('execution')));
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index cb2bfc9838..408511bd8b 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -1,4 +1,6 @@
custom->common = 'Custom';
$lang->custom->index = 'Home';
$lang->custom->set = 'Customize';
@@ -19,7 +21,6 @@ $lang->custom->score = 'Score';
$lang->custom->timezone = 'Timezone';
$lang->custom->scoreReset = 'Reset Score';
$lang->custom->scoreTitle = 'Point Feature';
-$lang->custom->execution = 'Execution';
$lang->custom->product = $lang->productCommon;
$lang->custom->convertFactor = 'Convert factor';
$lang->custom->region = 'Interval';
@@ -46,6 +47,9 @@ $lang->custom->switch = "Switch";
$lang->custom->oneUnit = "One {$lang->hourCommon}";
$lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
+if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
+if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
$lang->custom->unitList['cost'] = 'Yuan/Hour';
@@ -71,12 +75,12 @@ $lang->custom->saveTips = 'After clicking save, the current %s will b
$lang->custom->numberError = 'The interval must be greater than zero!';
-$lang->custom->closedExecution = 'Closed Executions';
+$lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
$lang->custom->closedProduct = 'Closed ' . $lang->productCommon;
-$lang->custom->object['project'] = 'Project';
+if($config->systemMode == 'new') $lang->custom->object['project'] = 'Project';
$lang->custom->object['product'] = $lang->productCommon;
-$lang->custom->object['execution'] = 'Execution';
+$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['story'] = 'Story';
$lang->custom->object['task'] = 'Task';
$lang->custom->object['bug'] = 'Bug';
@@ -164,7 +168,7 @@ $lang->custom->notice->required = 'The selected field is required.';
$lang->custom->notice->conceptResult = 'According to your preference, %s-%s is set for you. Use %s + %s。';
$lang->custom->notice->conceptPath = 'Go to Admin -> Custom -> Concept to set it.';
$lang->custom->notice->readOnlyOfProduct = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases and plans of the closed product is also forbidden.';
-$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed execution is also forbidden.";
+$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
$lang->custom->notice->URSREmpty = 'Custom requirement name can not be empty!';
$lang->custom->notice->confirmDelete = 'Are you sure you want to delete it?';
@@ -221,7 +225,7 @@ $lang->custom->CRExecution[0] = 'Change Forbidden';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = 'Plan';
-$lang->custom->moduleName['execution'] = 'Execution';
+$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->conceptQuestions['overview'] = "1. Which combination of management fits your company?";
$lang->custom->conceptQuestions['URAndSR'] = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 6a1c8fbce9..c503045d1c 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -1,4 +1,6 @@
custom->common = 'Custom';
$lang->custom->index = 'Home';
$lang->custom->set = 'Customize';
@@ -19,7 +21,6 @@ $lang->custom->score = 'Point';
$lang->custom->timezone = 'Timezone';
$lang->custom->scoreReset = 'Reset Points';
$lang->custom->scoreTitle = 'Point Feature';
-$lang->custom->execution = 'Execution';
$lang->custom->product = $lang->productCommon;
$lang->custom->convertFactor = 'Convert factor';
$lang->custom->region = 'Interval';
@@ -46,6 +47,9 @@ $lang->custom->switch = "Switch";
$lang->custom->oneUnit = "One {$lang->hourCommon}";
$lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
+if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
+if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
$lang->custom->unitList['cost'] = 'Yuan/Hour';
@@ -71,12 +75,12 @@ $lang->custom->saveTips = 'After clicking save, the current %s will b
$lang->custom->numberError = 'The interval must be greater than zero!';
-$lang->custom->closedExecution = 'Closed Executions';
+$lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
$lang->custom->closedProduct = 'Closed ' . $lang->productCommon;
-$lang->custom->object['project'] = 'Project';
+if($config->systemMode == 'new') $lang->custom->object['project'] = 'Project';
$lang->custom->object['product'] = $lang->productCommon;
-$lang->custom->object['execution'] = 'Execution';
+$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['story'] = 'Story';
$lang->custom->object['task'] = 'Task';
$lang->custom->object['bug'] = 'Bug';
@@ -164,7 +168,7 @@ $lang->custom->notice->required = 'The selected field is required.';
$lang->custom->notice->conceptResult = 'According to your preference, %s-%s is set for you. Use %s + %s.';
$lang->custom->notice->conceptPath = 'Go to Admin -> Custom -> Concept to set it.';
$lang->custom->notice->readOnlyOfProduct = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases and plans of the closed product is also forbidden.';
-$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed execution is also forbidden.";
+$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
$lang->custom->notice->URSREmpty = 'Custom requirement name can not be empty!';
$lang->custom->notice->confirmDelete = 'Are you sure you want to delete it?';
@@ -221,7 +225,7 @@ $lang->custom->CRExecution[0] = 'Change Forbidden';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = 'Plan';
-$lang->custom->moduleName['execution'] = 'Execution';
+$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->conceptQuestions['overview'] = "1. Which combination of management fits your company?";
$lang->custom->conceptQuestions['URAndSR'] = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 8f403c1fb6..6f7ef9f418 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -1,4 +1,6 @@
custom->common = 'Personnalisation';
$lang->custom->index = 'Accueil';
$lang->custom->set = 'Personnaliser';
@@ -19,7 +21,6 @@ $lang->custom->score = 'Point';
$lang->custom->timezone = 'Timezone';
$lang->custom->scoreReset = 'Réinit Points';
$lang->custom->scoreTitle = 'Fonctionnalité des Points';
-$lang->custom->execution = 'Execution';
$lang->custom->product = $lang->productCommon;
$lang->custom->convertFactor = 'Convert factor';
$lang->custom->region = 'Interval';
@@ -46,6 +47,9 @@ $lang->custom->switch = "Switch";
$lang->custom->oneUnit = "One {$lang->hourCommon}";
$lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
+if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
+if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
$lang->custom->unitList['cost'] = 'Yuan/Hour';
@@ -71,12 +75,12 @@ $lang->custom->saveTips = 'After clicking save, the current %s will b
$lang->custom->numberError = 'The interval must be greater than zero!';
-$lang->custom->closedExecution = 'Closed Executions';
+$lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
$lang->custom->closedProduct = 'Closed ' . $lang->productCommon;
-$lang->custom->object['project'] = 'Project';
+if($config->systemMode == 'new') $lang->custom->object['project'] = 'Project';
$lang->custom->object['product'] = $lang->productCommon;
-$lang->custom->object['execution'] = 'Execution';
+$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['story'] = 'Story';
$lang->custom->object['task'] = 'Tâche';
$lang->custom->object['bug'] = 'Bug';
@@ -164,7 +168,7 @@ $lang->custom->notice->required = 'Le champ sélectionné est obligat
$lang->custom->notice->conceptResult = 'Selon votre préférence, %s-%s peut être fixé pour vous. Utilisez %s + %s。';
$lang->custom->notice->conceptPath = 'Allez à Admin -> Custom -> Concept pour le paramétrer.';
$lang->custom->notice->readOnlyOfProduct = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases and plans of the closed product is also forbidden.';
-$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed execution is also forbidden.";
+$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
$lang->custom->notice->URSREmpty = 'Custom requirement name can not be empty!';
$lang->custom->notice->confirmDelete = 'Are you sure you want to delete it?';
@@ -221,7 +225,7 @@ $lang->custom->CRExecution[0] = 'Change Forbidden';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = 'Plan';
-$lang->custom->moduleName['execution'] = 'Execution';
+$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->conceptQuestions['overview'] = "1. Quelle combinaison de gestion convient le mieux à votre entreprise ?";
$lang->custom->conceptQuestions['URAndSR'] = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php
index 01f807d6a5..cf9b0cbf18 100644
--- a/module/custom/lang/vi.php
+++ b/module/custom/lang/vi.php
@@ -1,4 +1,6 @@
custom->common = 'Tùy biến';
$lang->custom->index = 'Trang chủ';
$lang->custom->set = 'Tùy biến';
@@ -19,7 +21,6 @@ $lang->custom->score = 'Điểm';
$lang->custom->timezone = 'Timezone';
$lang->custom->scoreReset = 'Thiết lập lại điểm';
$lang->custom->scoreTitle = 'Tính năng điểm';
-$lang->custom->execution = 'Execution';
$lang->custom->product = $lang->productCommon;
$lang->custom->convertFactor = 'Convert factor';
$lang->custom->region = 'Interval';
@@ -46,6 +47,9 @@ $lang->custom->switch = "Switch";
$lang->custom->oneUnit = "One {$lang->hourCommon}";
$lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
+if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
+if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
$lang->custom->unitList['cost'] = 'Yuan/Hour';
@@ -71,12 +75,12 @@ $lang->custom->saveTips = 'After clicking save, the current %s will b
$lang->custom->numberError = 'The interval must be greater than zero!';
-$lang->custom->closedExecution = 'Closed Executions';
+$lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
$lang->custom->closedProduct = 'Closed ' . $lang->productCommon;
-$lang->custom->object['project'] = 'Project';
+if($config->systemMode == 'new') $lang->custom->object['project'] = 'Project';
$lang->custom->object['product'] = $lang->productCommon;
-$lang->custom->object['execution'] = 'Execution';
+$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['story'] = 'Câu chuyện';
$lang->custom->object['task'] = 'Nhiệm vụ';
$lang->custom->object['bug'] = 'Bug';
@@ -164,7 +168,7 @@ $lang->custom->notice->required = 'Trường được chọn là bắ
$lang->custom->notice->conceptResult = 'According to your preference, %s-%s is set for you. Sử dụng %s + %s.';
$lang->custom->notice->conceptPath = 'Vào Quản trị -> Tùy biến -> Mô hình để thiết lập nó.';
$lang->custom->notice->readOnlyOfProduct = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases and plans of the closed product is also forbidden.';
-$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed execution is also forbidden.";
+$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
$lang->custom->notice->URSREmpty = 'Custom requirement name can not be empty!';
$lang->custom->notice->confirmDelete = 'Are you sure you want to delete it?';
@@ -221,7 +225,7 @@ $lang->custom->CRExecution[0] = 'Change Forbidden';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = 'Kế hoạch';
-$lang->custom->moduleName['execution'] = 'Execution';
+$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->conceptQuestions['overview'] = "1. Sự kết hợp quản lý nào phù hợp với công ty của bạn?";
$lang->custom->conceptQuestions['URAndSR'] = "2. Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index d02db166d0..aa40fc9a08 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -1,4 +1,6 @@
custom->common = '自定义';
$lang->custom->index = '首页';
$lang->custom->set = '自定义配置';
@@ -19,7 +21,6 @@ $lang->custom->score = '积分';
$lang->custom->timezone = '时区';
$lang->custom->scoreReset = '重置积分';
$lang->custom->scoreTitle = '积分功能';
-$lang->custom->execution = '执行';
$lang->custom->product = $lang->productCommon;
$lang->custom->convertFactor = '换算系数';
$lang->custom->region = '区间';
@@ -46,6 +47,9 @@ $lang->custom->switch = "切换";
$lang->custom->oneUnit = "一个{$lang->hourCommon}";
$lang->custom->convertRelationTitle = "请先设置{$lang->hourCommon}转换为%s的换算系数";
+if($config->systemMode == 'new') $lang->custom->execution = '执行';
+if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+
$lang->custom->unitList['efficiency'] = '工时/';
$lang->custom->unitList['manhour'] = '人时/';
$lang->custom->unitList['cost'] = '元/小时';
@@ -71,12 +75,12 @@ $lang->custom->saveTips = '点击保存后,则以当前%s为默认
$lang->custom->numberError = '区间必须大于零';
-$lang->custom->closedExecution = '已关闭执行';
+$lang->custom->closedExecution = '已关闭' . $lang->custom->execution;
$lang->custom->closedProduct = '已关闭' . $lang->productCommon;
-$lang->custom->object['project'] = '项目';
+if($config->systemMode == 'new') $lang->custom->object['project'] = '项目';
$lang->custom->object['product'] = $lang->productCommon;
-$lang->custom->object['execution'] = '执行';
+$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['story'] = $lang->SRCommon;
$lang->custom->object['task'] = '任务';
$lang->custom->object['bug'] = 'Bug';
@@ -151,26 +155,26 @@ $lang->custom->allLang = '适用所有语言';
$lang->custom->confirmRestore = '是否要恢复默认配置?';
$lang->custom->notice = new stdclass();
-$lang->custom->notice->userFieldNotice = '控制以上字段在用户相关页面是否显示,留空则全部显示';
-$lang->custom->notice->canNotAdd = '该项参与运算,不提供自定义添加功能';
-$lang->custom->notice->forceReview = "指定人提交的%s必须评审。";
-$lang->custom->notice->forceNotReview = "指定人提交的%s不需要评审。";
-$lang->custom->notice->longlife = 'Bug列表页面的久未处理标签中,列出设置天数之前未处理的Bug。';
-$lang->custom->notice->invalidNumberKey = '键值应为不大于255的数字';
-$lang->custom->notice->invalidStringKey = '键值应当为小写英文字母、数字或下划线的组合';
-$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set方法不存在或禁用,不能设置时区。';
-$lang->custom->notice->noClosedBlock = '没有永久关闭的区块';
-$lang->custom->notice->required = '页面提交时,选中的字段必填';
-$lang->custom->notice->conceptResult = '我们已经根据您的选择为您设置了 %s-%s 模式,使用%s + %s。';
-$lang->custom->notice->conceptPath = '您可以在:后台 -> 自定义 -> 流程页面修改。';
-$lang->custom->notice->readOnlyOfProduct = '禁止修改后,已关闭' . $lang->productCommon . '下的' . $lang->SRCommon . '、Bug、用例、日志、发布、计划都禁止修改。';
-$lang->custom->notice->readOnlyOfExecution = '禁止修改后,已关闭执行下的任务、版本、日志以及关联需求都禁止修改。';
-$lang->custom->notice->URSREmpty = '自定义需求名称不能为空!';
-$lang->custom->notice->confirmDelete = '您确定要删除吗?';
+$lang->custom->notice->userFieldNotice = '控制以上字段在用户相关页面是否显示,留空则全部显示';
+$lang->custom->notice->canNotAdd = '该项参与运算,不提供自定义添加功能';
+$lang->custom->notice->forceReview = "指定人提交的%s必须评审。";
+$lang->custom->notice->forceNotReview = "指定人提交的%s不需要评审。";
+$lang->custom->notice->longlife = 'Bug列表页面的久未处理标签中,列出设置天数之前未处理的Bug。';
+$lang->custom->notice->invalidNumberKey = '键值应为不大于255的数字';
+$lang->custom->notice->invalidStringKey = '键值应当为小写英文字母、数字或下划线的组合';
+$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set方法不存在或禁用,不能设置时区。';
+$lang->custom->notice->noClosedBlock = '没有永久关闭的区块';
+$lang->custom->notice->required = '页面提交时,选中的字段必填';
+$lang->custom->notice->conceptResult = '我们已经根据您的选择为您设置了 %s-%s 模式,使用%s + %s。';
+$lang->custom->notice->conceptPath = '您可以在:后台 -> 自定义 -> 流程页面修改。';
+$lang->custom->notice->readOnlyOfProduct = '禁止修改后,已关闭' . $lang->productCommon . '下的' . $lang->SRCommon . '、Bug、用例、日志、发布、计划都禁止修改。';
+$lang->custom->notice->readOnlyOfExecution = "禁止修改后,已关闭{$lang->custom->execution}下的任务、版本、日志以及关联需求都禁止修改。";
+$lang->custom->notice->URSREmpty = '自定义需求名称不能为空!';
+$lang->custom->notice->confirmDelete = '您确定要删除吗?';
-$lang->custom->notice->indexPage['product'] = "从8.2版本起增加了产品主页视图,是否默认进入产品主页?";
-$lang->custom->notice->indexPage['project'] = "从8.2版本起增加了项目主页视图,是否默认进入项目主页?";
-$lang->custom->notice->indexPage['qa'] = "从8.2版本起增加了测试主页视图,是否默认进入测试主页?";
+$lang->custom->notice->indexPage['product'] = "从8.2版本起增加了产品主页视图,是否默认进入产品主页?";
+$lang->custom->notice->indexPage['project'] = "从8.2版本起增加了项目主页视图,是否默认进入项目主页?";
+$lang->custom->notice->indexPage['qa'] = "从8.2版本起增加了测试主页视图,是否默认进入测试主页?";
$lang->custom->notice->invalidStrlen['ten'] = '键的长度必须小于10个字符!';
$lang->custom->notice->invalidStrlen['twenty'] = '键的长度必须小于20个字符!';
@@ -221,7 +225,7 @@ $lang->custom->CRExecution[0] = '禁止修改';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = '计划';
-$lang->custom->moduleName['execution'] = '执行';
+$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->conceptQuestions['overview'] = "1. 下述哪种组合方式更适合您公司的管理现状?";
$lang->custom->conceptQuestions['URAndSR'] = "2. 是否启用{$lang->URCommon}和{$lang->SRCommon}概念?";
diff --git a/module/execution/model.php b/module/execution/model.php
index acbc4c350e..df9c0acdb2 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1150,10 +1150,14 @@ class executionModel extends model
{
$link = helper::createLink($module, $method, "executionID=%s&type=$extra");
}
- elseif($module == 'execution' && ($method == 'index' or $method == 'all'))
+ elseif($module == 'execution' and ($method == 'index' or $method == 'all'))
{
$link = helper::createLink($module, 'task', "executionID=%s");
}
+ elseif($module == 'bug' and $method == 'create' and $this->app->openApp == 'execution')
+ {
+ $link = helper::createLink($module, $method, "productID=0&branch=0&extra=executionID=%s");
+ }
else
{
$link = helper::createLink($module, $method, "executionID=%s");
@@ -2818,7 +2822,7 @@ class executionModel extends model
* @access public
* @return void
*/
- public function buildBugSearchForm($products, $queryID, $actionURL)
+ public function buildBugSearchForm($products, $queryID, $actionURL, $type = 'execution')
{
$modules = array();
$builds = array('' => '', 'trunk' => $this->lang->trunk);
@@ -2863,7 +2867,7 @@ class executionModel extends model
}
}
- $this->config->bug->search['module'] = 'executionBug';
+ $this->config->bug->search['module'] = $type == 'execution' ? 'executionBug' : 'projectBug';
$this->config->bug->search['actionURL'] = $actionURL;
$this->config->bug->search['queryID'] = $queryID;
unset($this->config->bug->search['fields']['execution']);
diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 4765518eff..5aff5361a4 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -24,13 +24,13 @@ foreach($executions as $execution)
$executionName = $config->systemMode == 'new' ? zget($projects, $execution->project) . '/' . $execution->name : $execution->name;
if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account])))
{
- $myProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='text-important $selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'");
+ $myProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='text-important $selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
}
else if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account]))
{
- $normalProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'");
+ $normalProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
}
- else if($execution->status == 'done' or $execution->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'");
+ else if($execution->status == 'done' or $execution->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
}
?>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 3400b3411d..9bf9bf8739 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -189,7 +189,7 @@ if($config->systemMode == 'new')
$lang->resource->project = new stdclass();
$lang->resource->project->index = 'index';
$lang->resource->project->browse = 'browse';
- $lang->resource->project->projectTitle = 'moduleOpen';
+ $lang->resource->project->programTitle = 'moduleOpen';
$lang->resource->project->create = 'create';
$lang->resource->project->edit = 'edit';
$lang->resource->project->batchEdit = 'batchEdit';
diff --git a/module/index/css/index.css b/module/index/css/index.css
index 7a907d2edd..db0a7d7ce3 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -18,7 +18,6 @@ body.menu-hide {padding-left: 0;}
.menu-toggle .is-unfold, .menu-hide .menu-toggle .is-collapse {display: none;}
.menu-hide .menu-toggle .is-unfold {display: inline;}
#menuToggleItem,
-.menu-hide #menuToggleMenu {display: none;}
.menu-hide #menuToggleItem {display: list-item;}
.menu-hide #menu .nav > li {padding: 4px;}
.menu-hide #menu .nav > li > a {padding: 6px 4px; text-align: center;}
@@ -60,16 +59,16 @@ body.menu-hide {padding-left: 0;}
#bars > li.active:after {content: ' '; display: block; position: absolute; height: 3px; left: 5px; right: 5px; bottom: 0; border-radius: 2px;}
#bars > li.divider{margin-right: 5px; margin-top: 10px; height: 20px; border-right: 1px solid #d9d9d9;}
-#userNav {float: none; margin: 0;}
-#userNav>li {text-align: center;}
-#userNav>li>.dropdown-menu {left: 100%; bottom: 0; top: auto; width: 140px; text-align: left; background: #3c495c;}
-#userNav>li>.dropdown-menu a {color: #fff;}
-#userNav>li>.dropdown-menu .dropdown-menu {left: 100%; text-align: left; background: #3c495c;}
-#userNav>li .top .dropdown-menu {top: -60px;}
-#userNav .dropdown-menu>li>a>.icon {position: relative; top: 0; display: inline;}
-#userNav li.open>a {background: #0c64eb;}
-#userNav li.divider {opacity: .24; border-top: 1px solid; height: 2px;}
-#userNav .dropdown-submenu:focus > a, #userNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);}
+#flodNav {float: none; margin: 0;}
+#flodNav>li {text-align: center;}
+#flodNav>li>.dropdown-menu {left: 100%; bottom: 0; top: auto; width: 140px; text-align: left; background: #3c495c;}
+#flodNav>li>.dropdown-menu a {color: #fff;}
+#flodNav>li>.dropdown-menu .dropdown-menu {left: 100%; text-align: left; background: #3c495c;}
+#flodNav>li .top .dropdown-menu {top: -60px;}
+#flodNav .dropdown-menu>li>a>.icon {position: relative; top: 0; display: inline;}
+#flodNav li.open>a {background: #0c64eb;}
+#flodNav li.divider {opacity: .24; border-top: 1px solid; height: 2px;}
+#flodNav .dropdown-submenu:focus > a, #flodNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);}
#poweredBy {width: 40%; position: absolute; top: 4px; right: 0; padding: 0;}
#globalSearchDiv {width: 52%; float: right; margin-right: 4px;}
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index fe375a650b..fb8d80a613 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -55,9 +55,13 @@ js::set('defaultOpen', $open);
-
-
+
+