<\/div><\/div>/g" zentaoxx/module/client/view/checkupgrade.html.php
- sed -i '/var serverVersions/d' zentaoxx/module/client/js/checkupgrade.js
- sed -i '/var currentVersion/d' zentaoxx/module/client/js/checkupgrade.js
- sed -i '/setRequiredFields(/d' zentaoxx/module/common/view/header.modal.html.php
- sed -i 's/header.html.php/header.lite.html.php/g' zentaoxx/module/common/view/header.modal.html.php
- sed -i 's/footer.html.php/footer.lite.html.php/g' zentaoxx/module/common/view/footer.modal.html.php
- sed -i 's/v\.//g' zentaoxx/module/im/js/debug.js
- sed -i 's/helper::jsonEncode(/json_encode(/g' zentaoxx/framework/xuanxuan.class.php
- sed -i "s/lang->goback,/lang->goback, '',/g" zentaoxx/module/im/view/debug.html.php
- sed -i 's/v\.//g' zentaoxx/module/client/js/checkupgrade.js
- sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql
- mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php
- cp tools/en2de.php zentaoxx/tools; cd zentaoxx/tools; php en2de.php ../
- rm -rf zentaoxx/tools
- zip -rqm -9 zentaoxx.$(VERSION).zip zentaoxx/*
- rm -rf xuan.zip xuan zentaoxx
-package:
- # change mode.
- chmod -R 777 zentaopms/tmp/
- chmod -R 777 zentaopms/www/data
- chmod -R 777 zentaopms/config
- chmod 777 zentaopms/module
- chmod 777 zentaopms/www
- chmod a+rx zentaopms/bin/*
- if [ ! -d "zentaopms/config/ext" ]; then mkdir zentaopms/config/ext; fi
- for module in `ls zentaopms/module/`; do if [ ! -d "zentaopms/module/$$module/ext" ]; then mkdir zentaopms/module/$$module/ext; fi done
- find zentaopms/ -name ext |xargs chmod -R 777
- mkdir zentaopms/tools; cp tools/cn2tw.php zentaopms/tools; cd zentaopms/tools; php cn2tw.php
- #rm -r zentaopms/module/misc/ext
- rm -rf zentaopms/tools
-pms:
- make common
- make zentaoxx
- unzip zentaoxx.*.zip
- cp zentaoxx/* zentaopms/ -r
- cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql
- make package
- zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms
- rm -fr zentaopms zentaoxx zentaoxx.*.zip
-deb:
- mkdir buildroot
- cp -r build/debian/DEBIAN buildroot
- sed -i '/^Version/cVersion: ${VERSION}' buildroot/DEBIAN/control
- mkdir buildroot/opt
- mkdir buildroot/etc/apache2/sites-enabled/ -p
- cp build/debian/zentaopms.conf buildroot/etc/apache2/sites-enabled/
- cp ZenTaoPMS.${VERSION}.zip buildroot/opt
- cd buildroot/opt; unzip ZenTaoPMS.${VERSION}.zip; mv zentaopms zentao; rm ZenTaoPMS.${VERSION}.zip
- sed -i 's/index.php/\/zentao\/index.php/' buildroot/opt/zentao/www/.htaccess
- sudo dpkg -b buildroot/ ZenTaoPMS_${VERSION}_1_all.deb
- rm -rf buildroot
-rpm:
- mkdir ~/rpmbuild/SPECS -p
- cp build/rpm/zentaopms.spec ~/rpmbuild/SPECS
- sed -i '/^Version/cVersion:${VERSION}' ~/rpmbuild/SPECS/zentaopms.spec
- mkdir ~/rpmbuild/SOURCES
- cp ZenTaoPMS.${VERSION}.zip ~/rpmbuild/SOURCES
- mkdir ~/rpmbuild/SOURCES/etc/httpd/conf.d/ -p
- cp build/debian/zentaopms.conf ~/rpmbuild/SOURCES/etc/httpd/conf.d/
- mkdir ~/rpmbuild/SOURCES/opt/ -p
- cd ~/rpmbuild/SOURCES; unzip ZenTaoPMS.${VERSION}.zip; mv zentaopms opt/zentao;
- sed -i 's/index.php/\/zentao\/index.php/' ~/rpmbuild/SOURCES/opt/zentao/www/.htaccess
- cd ~/rpmbuild/SOURCES; tar -czvf zentaopms-${VERSION}.tar.gz etc opt; rm -rf ZenTaoPMS.${VERSION}.zip etc opt;
- rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec
- cp ~/rpmbuild/RPMS/noarch/zentaopms-${VERSION}-1.noarch.rpm ./
- rm -rf ~/rpmbuild
-en:
- make common
- cd zentaopms/; grep -rl 'zentao.net'|xargs sed -i 's/zentao.net/zentao.pm/g';
- cd zentaopms/; grep -rl 'http://www.zentao.pm'|xargs sed -i 's/http:\/\/www.zentao.pm/https:\/\/www.zentao.pm/g';
- cd zentaopms/config/; echo >> config.php; echo '$$config->isINT = true;' >> config.php
- make package
- mv zentaopms zentaoalm
- zip -r -9 ZenTaoALM.$(VERSION).int.zip zentaoalm
- rm -fr zentaoalm
- echo $(VERSION).int > VERSION
- make endeb
- make enrpm
- echo $(VERSION) > VERSION
-endeb:
- mkdir buildroot
- cp -r build/debian/DEBIAN buildroot
- sed -i '/^Version/cVersion: ${VERSION}' buildroot/DEBIAN/control
- mkdir buildroot/opt
- mkdir buildroot/etc/apache2/sites-enabled/ -p
- cp build/debian/zentaopms.conf buildroot/etc/apache2/sites-enabled/
- cp ZenTaoALM.${VERSION}.zip buildroot/opt
- cd buildroot/opt; unzip ZenTaoALM.${VERSION}.zip; mv zentaoalm zentao; rm ZenTaoALM.${VERSION}.zip
- sed -i 's/index.php/\/zentao\/index.php/' buildroot/opt/zentao/www/.htaccess
- sudo dpkg -b buildroot/ ZenTaoALM_${VERSION}_1_all.deb
- rm -rf buildroot
-enrpm:
- mkdir ~/rpmbuild/SPECS -p
- cp build/rpm/zentaopms.spec ~/rpmbuild/SPECS
- sed -i '/^Version/cVersion:${VERSION}' ~/rpmbuild/SPECS/zentaopms.spec
- sed -i '/^Name:/cName:zentaoalm' ~/rpmbuild/SPECS/zentaopms.spec
- mkdir ~/rpmbuild/SOURCES
- cp ZenTaoALM.${VERSION}.zip ~/rpmbuild/SOURCES
- mkdir ~/rpmbuild/SOURCES/etc/httpd/conf.d/ -p
- cp build/debian/zentaopms.conf ~/rpmbuild/SOURCES/etc/httpd/conf.d/zentaoalm.conf
- mkdir ~/rpmbuild/SOURCES/opt/ -p
- cd ~/rpmbuild/SOURCES; unzip ZenTaoALM.${VERSION}.zip; mv zentaoalm opt/zentao;
- sed -i 's/index.php/\/zentao\/index.php/' ~/rpmbuild/SOURCES/opt/zentao/www/.htaccess
- cd ~/rpmbuild/SOURCES; tar -czvf zentaoalm-${VERSION}.tar.gz etc opt; rm -rf ZenTaoALM.${VERSION}.zip etc opt;
- rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec
- cp ~/rpmbuild/RPMS/noarch/zentaoalm-${VERSION}-1.noarch.rpm ./
- rm -rf ~/rpmbuild
-patchphpdoc:
- sudo cp misc/doc/phpdoc/*.tpl /usr/share/php/data/PhpDocumentor/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/
-phpdoc:
- phpdoc -d bin,framework,config,lib,module,www -t api -o HTML:frames:phphtmllib -ti ZenTaoPMSAPI参考手册 -s on -pp on -i *test*
- phpdoc -d bin,framework,config,lib,module,www -t api.chm -o chm:default:default -ti ZenTaoPMSAPI参考手册 -s on -pp on -i *test*
-doxygen:
- doxygen doc/doxygen/doxygen.conf
+flow:
+ifneq ($(wildcard ranzhi),)
+ rm ranzhi -r
+endif
+ mkdir -p max/www
+ # move max extension to max.
+ cp -fr config max
+ cp -fr db max
+ cp -fr module max
+ cp -fr www/* max/www
+ cp www/favicon.ico max/www
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 6cfa8b2611..b4820acc3b 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -32,6 +32,9 @@ $lang->action->editComment = '修改备注';
$lang->action->create = '添加备注';
$lang->action->comment = '备注';
+$lang->action->undeleteAction = '还原数据';
+$lang->action->hideOneAction = '隐藏数据';
+
$lang->action->trashTips = '提示:为了保证系统的完整性,禅道系统的删除都是标记删除。';
$lang->action->textDiff = '文本格式';
$lang->action->original = '原始格式';
diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php
index 2b16e8cf41..f47c2a1137 100644
--- a/module/backup/lang/zh-cn.php
+++ b/module/backup/lang/zh-cn.php
@@ -1,5 +1,5 @@
backup->common = '备份';
+$lang->backup->common = '系统备份';
$lang->backup->index = '备份首页';
$lang->backup->history = '备份历史';
$lang->backup->delete = '删除备份';
@@ -8,6 +8,9 @@ $lang->backup->restore = '还原';
$lang->backup->change = '保留时间';
$lang->backup->changeAB = '修改';
$lang->backup->rmPHPHeader = '去除安全设置';
+$lang->backup->setting = '设置';
+
+$lang->backup->settingAction = '备份设置';
$lang->backup->time = '备份时间';
$lang->backup->files = '备份文件';
@@ -19,7 +22,6 @@ $lang->backup->status = '状态';
$lang->backup->statusList['success'] = '成功';
$lang->backup->statusList['fail'] = '失败';
-$lang->backup->setting = '设置';
$lang->backup->settingDir = '备份目录';
$lang->backup->settingList['nofile'] = '不备份附件和代码';
$lang->backup->settingList['nosafe'] = '不需要防下载PHP文件头';
diff --git a/module/bug/model.php b/module/bug/model.php
index c489d62260..bcd0e04bcd 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1150,9 +1150,10 @@ class bugModel extends model
$openedBuilds = $this->post->openedBuild;
if($openedBuilds)
{
+ $this->loadModel('build');
foreach($openedBuilds as $openedBuild)
{
- $build = $this->getByID($openedBuild);
+ $build = $this->build->getByID($openedBuild);
$build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ',');
$this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$openedBuild)->exec();
}
diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php
index b3fe557eb8..90cc8b069e 100644
--- a/module/caselib/lang/zh-cn.php
+++ b/module/caselib/lang/zh-cn.php
@@ -15,7 +15,7 @@ $lang->caselib->all = '所有用例库';
$lang->caselib->index = "用例库首页";
$lang->caselib->create = "创建用例库";
$lang->caselib->edit = '编辑用例库';
-$lang->caselib->browse = '浏览库用例';
+$lang->caselib->browse = '浏览用例库';
$lang->caselib->view = '查看库概况';
$lang->caselib->createCase = '创建用例';
$lang->caselib->delete = "删除";
@@ -24,9 +24,13 @@ $lang->caselib->deleted = '已删除';
$lang->caselib->exportTemplet = '导出模板';
$lang->caselib->batchCreateCase = '批量创建用例';
$lang->caselib->import = '导入';
-$lang->caselib->importAction = '导入用例';
$lang->caselib->showImport = '显示导入数据';
+$lang->caselib->browseAction = '用例库列表';
+$lang->caselib->deleteAction = "删除用例库";
+$lang->caselib->importAction = '导入用例';
+$lang->caselib->linkVersion = "版本";
+
$lang->caselib->id = '编号';
$lang->caselib->name = '名称';
$lang->caselib->desc = '描述';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 1571240b61..51e07da098 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -457,22 +457,15 @@ $lang->navGroup->productplan = 'product';
$lang->navGroup->release = 'product';
$lang->navGroup->branch = 'product';
$lang->navGroup->story = 'product';
-$lang->navGroup->tree = 'product';
$lang->navGroup->project = 'project';
-$lang->navGroup->testcase = 'project';
-$lang->navGroup->testtask = 'project';
-$lang->navGroup->testreport = 'project';
-$lang->navGroup->testsuite = 'project';
-$lang->navGroup->caselib = 'project';
-$lang->navGroup->feedback = 'project';
$lang->navGroup->deploy = 'project';
$lang->navGroup->stakeholder = 'project';
+$lang->navGroup->projectbuild = 'project';
$lang->navGroup->projectstory = 'project';
$lang->navGroup->review = 'project';
$lang->navGroup->reviewissue = 'project';
-$lang->navGroup->milestone = 'project';
$lang->navGroup->pssp = 'project';
$lang->navGroup->auditplan = 'project';
$lang->navGroup->cm = 'project';
@@ -480,6 +473,7 @@ $lang->navGroup->nc = 'project';
$lang->navGroup->projectrelease = 'project';
$lang->navGroup->build = 'project';
$lang->navGroup->measrecord = 'project';
+$lang->navGroup->milestone = 'project';
$lang->navGroup->execution = 'execution';
$lang->navGroup->task = 'execution';
@@ -494,12 +488,20 @@ $lang->navGroup->bug = 'qa';
$lang->navGroup->testcase = 'qa';
$lang->navGroup->testtask = 'qa';
$lang->navGroup->automation = 'qa';
+$lang->navGroup->testreport = 'qa';
+$lang->navGroup->testcase = 'qa';
+$lang->navGroup->testtask = 'qa';
+$lang->navGroup->testsuite = 'qa';
+$lang->navGroup->caselib = 'qa';
$lang->navGroup->devops = 'devops';
$lang->navGroup->repo = 'devops';
$lang->navGroup->job = 'devops';
$lang->navGroup->jenkins = 'devops';
$lang->navGroup->compile = 'devops';
+$lang->navGroup->ci = 'devops';
+$lang->navGroup->svn = 'devops';
+$lang->navGroup->git = 'devops';
$lang->navGroup->company = 'system';
$lang->navGroup->sqlbuilder = 'system';
diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php
index ae73267a10..5f526482c7 100644
--- a/module/cron/lang/zh-cn.php
+++ b/module/cron/lang/zh-cn.php
@@ -1,5 +1,5 @@
cron->common = '计划任务';
+$lang->cron->common = '定时任务';
$lang->cron->index = '首页';
$lang->cron->list = '任务列表';
$lang->cron->create = '添加';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index f9e1b3a0a2..ddf398a44d 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -82,6 +82,8 @@ $lang->doc->collect = '收藏';
$lang->doc->cancelCollection = '取消收藏';
$lang->doc->deleteFile = '删除附件';
+$lang->doc->collectAction = '收藏文档';
+
$lang->doc->libName = '文档库名称';
$lang->doc->libType = '文档库类型';
$lang->doc->custom = '自定义文档库';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 33295a17e3..c7c591195a 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -198,9 +198,9 @@ $lang->execution->deleteAB = "删除执行";
$lang->execution->browse = "浏览执行";
$lang->execution->list = "{$lang->executionCommon}列表";
$lang->execution->edit = "编辑{$lang->executionCommon}";
-$lang->execution->editAB = "编辑执行";
+$lang->execution->editAction = "编辑执行";
$lang->execution->batchEdit = "编辑";
-$lang->execution->batchEditAB = "批量编辑";
+$lang->execution->batchEditAction = "批量编辑";
$lang->execution->manageMembers = '团队管理';
$lang->execution->unlinkMember = '移除成员';
$lang->execution->unlinkStory = "移除{$lang->SRCommon}";
diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php
index 6f64bbc913..164c06497d 100644
--- a/module/extension/lang/zh-cn.php
+++ b/module/extension/lang/zh-cn.php
@@ -29,6 +29,8 @@ $lang->extension->eraseAction = '清除插件';
$lang->extension->upgrade = '升级插件';
$lang->extension->agreeLicense = '我同意该授权';
+$lang->extension->browseAction = '插件列表';
+
$lang->extension->structure = '目录结构';
$lang->extension->structureAction = '目录结构';
$lang->extension->installed = '已安装';
@@ -95,7 +97,7 @@ $lang->extension->noticeOkFile = '为了安全起见,系统需
mainNav as $module => $title):?>
+ action->dynamicAction->$module) and !isset($navGroup[$module])) continue;?>
为了安全起见,系统需
- 文件内容为空。
- 如果之前文件存在,删除之后重新创建。
-
';
+ ';
$lang->extension->upgradeExt = '升级';
$lang->extension->installExt = '安装';
diff --git a/module/group/control.php b/module/group/control.php
index 110fa34821..e8090b0030 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -146,6 +146,13 @@ class group extends control
$this->view->projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->andWhere('type')->eq('project')->orderBy('order_desc')->fetchPairs('id', 'name');
$this->view->products = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->orderBy('order_desc')->fetchPairs('id', 'name');
+ $navGroup = array();
+ foreach($this->lang->navGroup as $moduleName => $groupName)
+ {
+ if($groupName == $moduleName) continue;
+ $navGroup[$groupName][$moduleName] = $moduleName;
+ }
+ $this->view->navGroup = $navGroup;
$this->display();
}
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 33c80064c3..3400b3411d 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -21,9 +21,9 @@ $lang->moduleOrder[25] = 'product';
$lang->moduleOrder[30] = 'story';
$lang->moduleOrder[35] = 'productplan';
$lang->moduleOrder[40] = 'release';
-$lang->moduleOrder[45] = 'projectstory';
-$lang->moduleOrder[50] = 'project';
+$lang->moduleOrder[45] = 'project';
+$lang->moduleOrder[50] = 'projectstory';
$lang->moduleOrder[55] = 'execution';
$lang->moduleOrder[60] = 'task';
$lang->moduleOrder[65] = 'build';
@@ -73,26 +73,28 @@ $lang->index->methodOrder[0] = 'index';
/* My module. */
$lang->resource->my = new stdclass();
-$lang->resource->my->index = 'index';
+$lang->resource->my->index = 'indexAction';
$lang->resource->my->todo = 'todo';
-$lang->resource->my->calendar = 'calendar';
-$lang->resource->my->work = 'work';
-$lang->resource->my->contribute = 'contribute';
+$lang->resource->my->calendar = 'calendarAction';
+$lang->resource->my->work = 'workAction';
+$lang->resource->my->contribute = 'contributeAction';
$lang->resource->my->project = 'project';
-$lang->resource->my->profile = 'profile';
+$lang->resource->my->profile = 'profileAction';
$lang->resource->my->uploadAvatar = 'uploadAvatar';
$lang->resource->my->preference = 'preference';
-$lang->resource->my->dynamic = 'dynamic';
+$lang->resource->my->dynamic = 'dynamicAction';
$lang->resource->my->editProfile = 'editProfile';
$lang->resource->my->changePassword = 'changePassword';
$lang->resource->my->manageContacts = 'manageContacts';
$lang->resource->my->deleteContacts = 'deleteContacts';
$lang->resource->my->score = 'score';
-$lang->resource->my->unbind = 'unbind';
$lang->resource->my->team = 'team';
$lang->resource->my->story = 'story';
$lang->resource->my->task = 'task';
$lang->resource->my->bug = 'bug';
+$lang->resource->my->doc = 'doc';
+$lang->resource->my->issue = 'issue';
+$lang->resource->my->risk = 'risk';
$lang->resource->my->testtask = 'testtask';
$lang->resource->my->testcase = 'testcase';
$lang->resource->my->execution = 'execution';
@@ -119,6 +121,9 @@ $lang->my->methodOrder[90] = 'bug';
$lang->my->methodOrder[95] = 'testtask';
$lang->my->methodOrder[100] = 'testcase';
$lang->my->methodOrder[105] = 'execution';
+$lang->my->methodOrder[110] = 'doc';
+$lang->my->methodOrder[115] = 'issue';
+$lang->my->methodOrder[120] = 'risk';
/* Todo. */
$lang->resource->todo = new stdclass();
@@ -145,6 +150,7 @@ if($config->systemMode == 'new')
/* Program. */
$lang->resource->program = new stdclass();
$lang->resource->program->browse = 'browse';
+ $lang->resource->program->view = 'view';
$lang->resource->program->product = 'product';
$lang->resource->program->create = 'create';
$lang->resource->program->edit = 'edit';
@@ -158,16 +164,18 @@ if($config->systemMode == 'new')
$lang->resource->program->createStakeholder = 'createStakeholder';
$lang->resource->program->unlinkStakeholder = 'unlinkStakeholder';
$lang->resource->program->batchUnlinkStakeholders = 'batchUnlinkStakeholders';
+ $lang->resource->program->unbindWhitelist = 'unbindWhitelist';
$lang->resource->program->export = 'export';
$lang->program->methodOrder[10] = 'browse';
$lang->program->methodOrder[15] = 'product';
$lang->program->methodOrder[20] = 'create';
$lang->program->methodOrder[25] = 'edit';
- $lang->program->methodOrder[30] = 'start';
- $lang->program->methodOrder[35] = 'suspend';
- $lang->program->methodOrder[40] = 'close';
- $lang->program->methodOrder[45] = 'activate';
+ $lang->program->methodOrder[30] = 'view';
+ $lang->program->methodOrder[35] = 'start';
+ $lang->program->methodOrder[40] = 'suspend';
+ $lang->program->methodOrder[45] = 'close';
+ $lang->program->methodOrder[50] = 'activate';
$lang->program->methodOrder[55] = 'delete';
$lang->program->methodOrder[60] = 'project';
$lang->program->methodOrder[65] = 'stakeholder';
@@ -175,46 +183,47 @@ if($config->systemMode == 'new')
$lang->program->methodOrder[70] = 'unlinkStakeholder';
$lang->program->methodOrder[75] = 'batchUnlinkStakeholders';
$lang->program->methodOrder[80] = 'export';
+ $lang->program->methodOrder[85] = 'unbindWhitelist';
/* Project. */
$lang->resource->project = new stdclass();
- $lang->resource->project->index = 'index';
- $lang->resource->project->browse = 'browse';
- $lang->resource->project->programTitle = 'moduleOpen';
- $lang->resource->project->create = 'create';
- $lang->resource->project->edit = 'edit';
- $lang->resource->project->batchEdit = 'batchEdit';
- $lang->resource->project->group = 'group';
- $lang->resource->project->createGroup = 'createGroup';
- $lang->resource->project->manageView = 'manageView';
- $lang->resource->project->managePriv = 'managePriv';
- $lang->resource->project->manageMembers = 'manageMembers';
- $lang->resource->project->manageGroupMember = 'manageGroupMember';
- $lang->resource->project->copyGroup = 'copyGroup';
- $lang->resource->project->editGroup = 'editGroup';
- $lang->resource->project->start = 'start';
- $lang->resource->project->suspend = 'suspend';
- $lang->resource->project->close = 'close';
- $lang->resource->project->activate = 'activate';
- $lang->resource->project->delete = 'delete';
- $lang->resource->project->view = 'view';
- $lang->resource->project->whitelist = 'whitelist';
- $lang->resource->project->addWhitelist = 'addWhitelist';
- $lang->resource->project->unbindWhitelist = 'unbindWhitelist';
- $lang->resource->project->manageProducts = 'manageProducts';
- $lang->resource->project->view = 'view';
- $lang->resource->project->dynamic = 'dynamic';
- $lang->resource->project->build = 'build';
- $lang->resource->project->qa = 'qa';
- $lang->resource->project->bug = 'bug';
- $lang->resource->project->testcase = 'testcase';
- $lang->resource->project->testtask = 'testtask';
- $lang->resource->project->execution = 'execution';
- $lang->resource->project->testreport = 'testreport';
+ $lang->resource->project->index = 'index';
+ $lang->resource->project->browse = 'browse';
+ $lang->resource->project->projectTitle = 'moduleOpen';
+ $lang->resource->project->create = 'create';
+ $lang->resource->project->edit = 'edit';
+ $lang->resource->project->batchEdit = 'batchEdit';
+ $lang->resource->project->group = 'group';
+ $lang->resource->project->createGroup = 'createGroup';
+ $lang->resource->project->manageView = 'manageView';
+ $lang->resource->project->managePriv = 'managePriv';
+ $lang->resource->project->manageMembers = 'manageMembers';
+ $lang->resource->project->manageGroupMember = 'manageGroupMember';
+ $lang->resource->project->copyGroup = 'copyGroup';
+ $lang->resource->project->editGroup = 'editGroup';
+ $lang->resource->project->start = 'start';
+ $lang->resource->project->suspend = 'suspend';
+ $lang->resource->project->close = 'close';
+ $lang->resource->project->activate = 'activate';
+ $lang->resource->project->delete = 'delete';
+ $lang->resource->project->view = 'view';
+ $lang->resource->project->whitelist = 'whitelist';
+ $lang->resource->project->addWhitelist = 'addWhitelist';
+ $lang->resource->project->unbindWhitelist = 'unbindWhitelist';
+ $lang->resource->project->manageProducts = 'manageProducts';
+ $lang->resource->project->dynamic = 'dynamic';
+ $lang->resource->project->build = 'build';
+ $lang->resource->project->qa = 'qa';
+ $lang->resource->project->bug = 'bug';
+ $lang->resource->project->testcase = 'testcase';
+ $lang->resource->project->testtask = 'testtask';
+ $lang->resource->project->execution = 'execution';
+ $lang->resource->project->export = 'export';
+ $lang->resource->project->createGuide = 'createGuide';
$lang->project->methodOrder[0] = 'index';
$lang->project->methodOrder[5] = 'browse';
- $lang->project->methodOrder[10] = 'programTitle';
+ $lang->project->methodOrder[10] = 'projectTitle';
$lang->project->methodOrder[15] = 'create';
$lang->project->methodOrder[20] = 'edit';
$lang->project->methodOrder[25] = 'batchEdit';
@@ -246,6 +255,13 @@ if($config->systemMode == 'new')
$lang->project->methodOrder[155] = 'testtask';
$lang->project->methodOrder[160] = 'execution';
$lang->project->methodOrder[165] = 'testreport';
+ $lang->project->methodOrder[170] = 'export';
+ $lang->project->methodOrder[175] = 'createGuide';
+
+ $lang->resource->projectbuild = new stdclass();
+ $lang->resource->projectbuild->browse = 'browse';
+
+ $lang->projectbuild->methodOrder[5] = 'browse';
/* Personnel . */
$lang->resource->personnel = new stdclass();
@@ -264,7 +280,7 @@ if($config->systemMode == 'new')
/* Project Story. */
$lang->resource->projectstory = new stdclass();
$lang->resource->projectstory->story = 'story';
- $lang->resource->projectstory->track = 'track';
+ $lang->resource->projectstory->track = 'trackAction';
$lang->resource->projectstory->view = 'view';
$lang->resource->projectstory->linkStory = 'linkStory';
$lang->resource->projectstory->unlinkStory = 'unlinkStory';
@@ -279,7 +295,7 @@ if($config->systemMode == 'new')
/* Release. */
$lang->resource->projectrelease = new stdclass();
- $lang->resource->projectrelease->browse = 'browse';
+ $lang->resource->projectrelease->browse = 'browseAction';
$lang->resource->projectrelease->create = 'create';
$lang->resource->projectrelease->edit = 'edit';
$lang->resource->projectrelease->delete = 'delete';
@@ -310,7 +326,7 @@ if($config->systemMode == 'new')
/* Product. */
$lang->resource->product = new stdclass();
-$lang->resource->product->index = 'index';
+$lang->resource->product->index = 'indexAction';
$lang->resource->product->browse = 'browse';
$lang->resource->product->create = 'create';
$lang->resource->product->view = 'view';
@@ -369,9 +385,9 @@ $lang->resource->stakeholder->create = 'create';
$lang->resource->stakeholder->batchCreate = 'batchCreate';
$lang->resource->stakeholder->edit = 'edit';
$lang->resource->stakeholder->delete = 'delete';
-$lang->resource->stakeholder->view = 'view';
+$lang->resource->stakeholder->view = 'viewAction';
$lang->resource->stakeholder->issue = 'issue';
-$lang->resource->stakeholder->viewIssue = 'viewIssue';
+$lang->resource->stakeholder->viewIssue = 'viewIssueAction';
$lang->resource->stakeholder->communicate = 'communicate';
$lang->resource->stakeholder->expect = 'expect';
$lang->resource->stakeholder->expectation = 'expectation';
@@ -400,26 +416,26 @@ $lang->stakeholder->methodOrder[80] = 'userIssue';
/* Story. */
$lang->resource->story = new stdclass();
-$lang->resource->story->create = 'create';
-$lang->resource->story->batchCreate = 'batchCreate';
-$lang->resource->story->edit = 'editAB';
-$lang->resource->story->linkStory = 'linkStory';
-$lang->resource->story->batchEdit = 'batchEdit';
-$lang->resource->story->export = 'exportAction';
-$lang->resource->story->delete = 'deleteAction';
-$lang->resource->story->view = 'view';
-$lang->resource->story->change = 'changeAction';
-$lang->resource->story->review = 'reviewAction';
-$lang->resource->story->batchReview = 'batchReview';
-$lang->resource->story->assignTo = 'assignAction';
-$lang->resource->story->close = 'closeAction';
-$lang->resource->story->batchClose = 'batchClose';
-$lang->resource->story->activate = 'activateAction';
-$lang->resource->story->tasks = 'tasks';
-$lang->resource->story->bugs = 'bugs';
-$lang->resource->story->cases = 'cases';
-$lang->resource->story->zeroCase = 'zeroCase';
-$lang->resource->story->report = 'reportAction';
+$lang->resource->story->create = 'create';
+$lang->resource->story->batchCreate = 'batchCreate';
+$lang->resource->story->edit = 'editAction';
+$lang->resource->story->linkStory = 'linkStory';
+$lang->resource->story->batchEdit = 'batchEdit';
+$lang->resource->story->export = 'exportAction';
+$lang->resource->story->delete = 'deleteAction';
+$lang->resource->story->view = 'view';
+$lang->resource->story->change = 'changeAction';
+$lang->resource->story->review = 'reviewAction';
+$lang->resource->story->batchReview = 'batchReview';
+$lang->resource->story->assignTo = 'assignAction';
+$lang->resource->story->close = 'closeAction';
+$lang->resource->story->batchClose = 'batchClose';
+$lang->resource->story->activate = 'activateAction';
+$lang->resource->story->tasks = 'tasks';
+$lang->resource->story->bugs = 'bugs';
+$lang->resource->story->cases = 'cases';
+$lang->resource->story->zeroCase = 'zeroCase';
+$lang->resource->story->report = 'reportAction';
$lang->resource->story->batchChangePlan = 'batchChangePlan';
$lang->resource->story->batchChangeBranch = 'batchChangeBranch';
$lang->resource->story->batchChangeStage = 'batchChangeStage';
@@ -521,8 +537,8 @@ $lang->resource->execution->index = 'index';
$lang->resource->execution->view = 'view';
$lang->resource->execution->browse = 'browse';
$lang->resource->execution->create = 'createExec';
-$lang->resource->execution->edit = 'editAB';
-$lang->resource->execution->batchedit = 'batchEditAB';
+$lang->resource->execution->edit = 'editAction';
+$lang->resource->execution->batchedit = 'batchEditAction';
$lang->resource->execution->start = 'startAction';
$lang->resource->execution->activate = 'activateAction';
$lang->resource->execution->putoff = 'delayAction';
@@ -648,7 +664,7 @@ $lang->resource->task->delete = 'deleteAction';
$lang->resource->task->view = 'view';
$lang->resource->task->export = 'exportAction';
$lang->resource->task->confirmStoryChange = 'confirmStoryChange';
-$lang->resource->task->recordEstimate = 'recordEstimate';
+$lang->resource->task->recordEstimate = 'recordEstimateAction';
$lang->resource->task->editEstimate = 'editEstimate';
$lang->resource->task->deleteEstimate = 'deleteEstimate';
$lang->resource->task->report = 'reportChart';
@@ -703,13 +719,12 @@ $lang->build->methodOrder[50] = 'batchUnlinkBug';
/* QA. */
$lang->resource->qa = new stdclass();
-$lang->resource->qa->index = 'index';
+$lang->resource->qa->index = 'indexAction';
$lang->qa->methodOrder[0] = 'index';
/* Bug. */
$lang->resource->bug = new stdclass();
-$lang->resource->bug->index = 'index';
$lang->resource->bug->browse = 'browse';
$lang->resource->bug->create = 'create';
$lang->resource->bug->batchCreate = 'batchCreate';
@@ -761,7 +776,6 @@ $lang->bug->methodOrder[110] = 'batchChangeBranch';
/* Test case. */
$lang->resource->testcase = new stdclass();
-$lang->resource->testcase->index = 'index';
$lang->resource->testcase->browse = 'browse';
$lang->resource->testcase->groupCase = 'groupCase';
$lang->resource->testcase->create = 'create';
@@ -816,11 +830,10 @@ $lang->testcase->methodOrder[115] = 'batchCaseTypeChange';
/* Test task. */
$lang->resource->testtask = new stdclass();
-$lang->resource->testtask->index = 'index';
$lang->resource->testtask->create = 'create';
$lang->resource->testtask->browse = 'browse';
-$lang->resource->testtask->view = 'view';
-$lang->resource->testtask->cases = 'cases';
+$lang->resource->testtask->view = 'viewAction';
+$lang->resource->testtask->cases = 'casesAction';
$lang->resource->testtask->groupCase = 'groupCase';
$lang->resource->testtask->edit = 'edit';
$lang->resource->testtask->start = 'startAction';
@@ -899,10 +912,10 @@ $lang->testsuite->methodOrder[40] = 'batchUnlinkCases';
$lang->resource->caselib = new stdclass();
$lang->resource->caselib->index = 'index';
-$lang->resource->caselib->browse = 'browse';
+$lang->resource->caselib->browse = 'browseAction';
$lang->resource->caselib->create = 'create';
$lang->resource->caselib->edit = 'edit';
-$lang->resource->caselib->delete = 'delete';
+$lang->resource->caselib->delete = 'deleteAction';
$lang->resource->caselib->view = 'view';
$lang->resource->caselib->createCase = 'createCase';
$lang->resource->caselib->batchCreateCase = 'batchCreateCase';
@@ -928,7 +941,7 @@ $lang->resource->automation->browse = 'browse';
$lang->automation->methodOrder[0] = 'browse';
$lang->resource->repo = new stdclass();
-$lang->resource->repo->browse = 'browse';
+$lang->resource->repo->browse = 'browseAction';
$lang->resource->repo->view = 'view';
$lang->resource->repo->log = 'log';
$lang->resource->repo->revision = 'revisionAction';
@@ -938,7 +951,7 @@ $lang->resource->repo->edit = 'editAction';
$lang->resource->repo->delete = 'delete';
$lang->resource->repo->showSyncCommit = 'showSyncCommit';
$lang->resource->repo->diff = 'diffAction';
-$lang->resource->repo->download = 'download';
+$lang->resource->repo->download = 'downloadAction';
$lang->resource->repo->maintain = 'maintain';
$lang->resource->repo->setRules = 'setRules';
@@ -969,10 +982,10 @@ $lang->compile->methodOrder[5] = 'browse';
$lang->compile->methodOrder[10] = 'logs';
$lang->resource->jenkins = new stdclass();
-$lang->resource->jenkins->browse = 'browse';
+$lang->resource->jenkins->browse = 'browseAction';
$lang->resource->jenkins->create = 'create';
$lang->resource->jenkins->edit = 'edit';
-$lang->resource->jenkins->delete = 'delete';
+$lang->resource->jenkins->delete = 'deleteAction';
$lang->jenkins->methodOrder[5] = 'browse';
$lang->jenkins->methodOrder[10] = 'create';
@@ -980,7 +993,7 @@ $lang->jenkins->methodOrder[15] = 'edit';
$lang->jenkins->methodOrder[20] = 'delete';
$lang->resource->job = new stdclass();
-$lang->resource->job->browse = 'browse';
+$lang->resource->job->browse = 'browseAction';
$lang->resource->job->create = 'create';
$lang->resource->job->edit = 'edit';
$lang->resource->job->delete = 'delete';
@@ -1009,7 +1022,7 @@ $lang->resource->doc->allLibs = 'allLibs';
$lang->resource->doc->objectLibs = 'objectLibs';
$lang->resource->doc->showFiles = 'showFiles';
$lang->resource->doc->sort = 'sort';
-$lang->resource->doc->collect = 'collect';
+$lang->resource->doc->collect = 'collectAction';
//$lang->resource->doc->diff = 'diff';
$lang->doc->methodOrder[0] = 'index';
@@ -1073,6 +1086,7 @@ $lang->resource->custom->timezone = 'timezone';
$lang->resource->custom->setStoryConcept = 'setStoryConcept';
$lang->resource->custom->editStoryConcept = 'editStoryConcept';
$lang->resource->custom->browseStoryConcept = 'browseStoryConcept';
+$lang->resource->custom->setDefaultConcept = 'setDefaultConcept';
$lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept';
$lang->custom->methodOrder[5] = 'index';
@@ -1084,10 +1098,11 @@ $lang->custom->methodOrder[30] = 'flow';
$lang->custom->methodOrder[35] = 'working';
$lang->custom->methodOrder[40] = 'setPublic';
$lang->custom->methodOrder[45] = 'timezone';
-$lang->custom->methodOrder[50] = 'setStoryContcept';
-$lang->custom->methodOrder[55] = 'editStoryContcept';
-$lang->custom->methodOrder[60] = 'browseStoryContcept';
-$lang->custom->methodOrder[65] = 'deleteStoryContcept';
+$lang->custom->methodOrder[50] = 'setStoryConcept';
+$lang->custom->methodOrder[55] = 'editStoryConcept';
+$lang->custom->methodOrder[60] = 'browseStoryConcept';
+$lang->custom->methodOrder[65] = 'setDefaultConcept';
+$lang->custom->methodOrder[70] = 'deleteStoryConcept';
$lang->resource->datatable = new stdclass();
$lang->resource->datatable->setGlobal = 'setGlobal';
@@ -1182,6 +1197,8 @@ $lang->resource->user->cropAvatar = 'cropAvatar';
$lang->resource->user->profile = 'profile';
$lang->resource->user->batchEdit = 'batchEdit';
$lang->resource->user->unbind = 'unbind';
+$lang->resource->user->issue = 'issue';
+$lang->resource->user->risk = 'risk';
$lang->resource->user->setPublicTemplate = 'setPublicTemplate';
$lang->user->methodOrder[5] = 'create';
@@ -1194,12 +1211,14 @@ $lang->user->methodOrder[30] = 'todo';
$lang->user->methodOrder[35] = 'task';
$lang->user->methodOrder[40] = 'bug';
$lang->user->methodOrder[45] = 'project';
-$lang->user->methodOrder[50] = 'dynamic';
-$lang->user->methodOrder[55] = 'cropAvatar';
-$lang->user->methodOrder[60] = 'profile';
-$lang->user->methodOrder[65] = 'batchEdit';
-$lang->user->methodOrder[70] = 'unbind';
-$lang->user->methodOrder[75] = 'setPublicTemplate';
+$lang->user->methodOrder[50] = 'issue';
+$lang->user->methodOrder[55] = 'risk';
+$lang->user->methodOrder[60] = 'dynamic';
+$lang->user->methodOrder[65] = 'cropAvatar';
+$lang->user->methodOrder[70] = 'profile';
+$lang->user->methodOrder[75] = 'batchEdit';
+$lang->user->methodOrder[80] = 'unbind';
+$lang->user->methodOrder[85] = 'setPublicTemplate';
/* Tree. */
$lang->resource->tree = new stdclass();
@@ -1271,7 +1290,7 @@ $lang->admin->methodOrder[30] = 'ztCompany';
/* Extension. */
$lang->resource->extension = new stdclass();
-$lang->resource->extension->browse = 'browse';
+$lang->resource->extension->browse = 'browseAction';
$lang->resource->extension->obtain = 'obtain';
$lang->resource->extension->structure = 'structureAction';
$lang->resource->extension->install = 'install';
@@ -1295,11 +1314,11 @@ $lang->extension->methodOrder[50] = 'upgrade';
/* Webhook. */
$lang->resource->webhook = new stdclass();
-$lang->resource->webhook->browse = 'browse';
+$lang->resource->webhook->browse = 'list';
$lang->resource->webhook->create = 'create';
$lang->resource->webhook->edit = 'edit';
$lang->resource->webhook->delete = 'delete';
-$lang->resource->webhook->log = 'log';
+$lang->resource->webhook->log = 'logAction';
$lang->resource->webhook->bind = 'bind';
$lang->resource->webhook->chooseDept = 'chooseDept';
@@ -1350,8 +1369,8 @@ $lang->message->methodOrder[15] = 'setting';
$lang->resource->action = new stdclass();
$lang->resource->action->trash = 'trash';
-$lang->resource->action->undelete = 'undelete';
-$lang->resource->action->hideOne = 'hideOne';
+$lang->resource->action->undelete = 'undeleteAction';
+$lang->resource->action->hideOne = 'hideOneAction';
$lang->resource->action->hideAll = 'hideAll';
$lang->resource->action->comment = 'comment';
$lang->resource->action->editComment = 'editComment';
@@ -1369,7 +1388,7 @@ $lang->resource->backup->backup = 'backup';
$lang->resource->backup->restore = 'restore';
$lang->resource->backup->change = 'change';
$lang->resource->backup->delete = 'delete';
-$lang->resource->backup->setting = 'setting';
+$lang->resource->backup->setting = 'settingAction';
$lang->resource->backup->rmPHPHeader = 'rmPHPHeader';
$lang->backup->methodOrder[5] = 'index';
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index 3c90899db2..af5554b258 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -92,13 +92,14 @@
|
-
+
|
@@ -115,6 +116,8 @@
+
+
action->dynamicAction->$subModule)):?>
|---|