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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
holan20180123
2020-12-30 13:54:42 +08:00
parent 5178b3693d b6b15b7a9d
commit dfc7a434d1
20 changed files with 108 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/model.php
+2
View File
@@ -26,7 +26,9 @@ class ciModel extends model
{
$this->lang->navGroup->jenkins = 'repo';
$this->lang->navGroup->job = 'repo';
$this->lang->navGroup->compile = 'repo';
$this->lang->noMenuModule[] = 'job';
$this->lang->noMenuModule[] = 'compile';
}
}
module/common/lang/de.php
+15 -14
View File
@@ -139,7 +139,7 @@ $lang->mainNav->system = '<i class="icon icon-menu-users"></i> System|custom|es
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,project,repo,';
$lang->dividerMenu = ',project,doc,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap = 'Roadmap|product|roadmap|productID=%s';
$lang->product->viewMenu->dynamic = 'Dynamic|product|dynamic|productID=%s';
$lang->product->viewMenu->project = "Project|product|project|status=all&productID=%s";
$lang->product->viewMenu->doc = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
$lang->product->viewMenu->setting = array('link' => 'Setting|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->viewMenu->set = array('link' => 'Setting|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->settingMenu = new stdclass();
$lang->product->settingMenu->branch = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->settingMenu->module = array('link' => 'Module|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->settingMenu->whitelist = array('link' => 'Whitelist|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->product->setMenu = new stdclass();
$lang->product->setMenu->branch = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->setMenu->module = array('link' => 'Module|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->setMenu->whitelist = array('link' => 'Whitelist|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->release = new stdclass();
$lang->branch = new stdclass();
@@ -740,8 +740,9 @@ $lang->pager->pageOfTotal = "Page <strong>{page}</strong> of <strong>{totalPage
$lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = 'Not a valid color value';
global $config;
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label'>Upgrade</span></a>";
$lang->globalLogo = "<img src='{$this->config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "Download Desktop Notification";
$lang->downloadClient = "Download ZenTao Desktop";
$lang->clientHelp = "Client Help";
@@ -885,14 +886,14 @@ $lang->menu->scrum->qa = 'QA|qa|index';
$lang->menu->scrum->ci = 'Code|repo|browse';
$lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
$lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk');
$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->scrum->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list');
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->other = new stdclass();
$lang->scrum->subMenu->other->issue = 'Issue|issue|browse|';;
$lang->scrum->subMenu->other->risk = 'Risk|risk|browse|';;
$lang->scrum->subMenu->other->issue = array('link' => 'Issue|issue|browse|', 'subModule' => 'issue');
$lang->scrum->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk');
$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->scrum->subMenu->setting = new stdclass();
@@ -911,14 +912,14 @@ $lang->menu->waterfall->ci = 'Code|repo|browse|';
$lang->menu->waterfall->qa = array('link' => 'QA|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,caselib,');
$lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
$lang->menu->waterfall->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk');
$lang->menu->waterfall->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder');
$lang->menu->waterfall->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->waterfall->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'workestimation,durationestimation,budget,pssp');
$lang->waterfall = new stdclass();
$lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->other = new stdclass();
$lang->waterfall->subMenu->other->issue = 'Issue|issue|browse|';;
$lang->waterfall->subMenu->other->risk = 'Risk|risk|browse|';;
$lang->waterfall->subMenu->other->issue = array('link' => 'Issue|issue|browse|', 'subModule' => 'issue');
$lang->waterfall->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk');
$lang->waterfall->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->setting = new stdclass();
module/common/lang/en.php
+15 -14
View File
@@ -139,7 +139,7 @@ $lang->mainNav->system = '<i class="icon icon-menu-users"></i> System|custom|es
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,project,repo,';
$lang->dividerMenu = ',project,doc,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap = 'Roadmap|product|roadmap|productID=%s';
$lang->product->viewMenu->dynamic = 'Dynamic|product|dynamic|productID=%s';
$lang->product->viewMenu->project = "Project|product|project|status=all&productID=%s";
$lang->product->viewMenu->doc = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
$lang->product->viewMenu->setting = array('link' => 'Setting|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->viewMenu->set = array('link' => 'Setting|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->settingMenu = new stdclass();
$lang->product->settingMenu->branch = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->settingMenu->module = array('link' => 'Module|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->settingMenu->whitelist = array('link' => 'Whitelist|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->product->setMenu = new stdclass();
$lang->product->setMenu->branch = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->setMenu->module = array('link' => 'Module|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->setMenu->whitelist = array('link' => 'Whitelist|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->release = new stdclass();
$lang->branch = new stdclass();
@@ -740,8 +740,9 @@ $lang->pager->pageOfTotal = "Page <strong>{page}</strong> of <strong>{totalPage
$lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = 'Not a valid color value';
global $config;
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label'>Upgrade</span></a>";
$lang->globalLogo = "<img src='{$this->config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "Download Desktop Notification";
$lang->downloadClient = "Download ZenTao Desktop";
$lang->clientHelp = "Client Help";
@@ -885,14 +886,14 @@ $lang->menu->scrum->qa = 'QA|qa|index';
$lang->menu->scrum->ci = 'Code|repo|browse';
$lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
$lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk');
$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->scrum->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list');
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->other = new stdclass();
$lang->scrum->subMenu->other->issue = 'Issue|issue|browse|';;
$lang->scrum->subMenu->other->risk = 'Risk|risk|browse|';;
$lang->scrum->subMenu->other->issue = array('link' => 'Issue|issue|browse|', 'subModule' => 'issue');
$lang->scrum->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk');
$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->scrum->subMenu->setting = new stdclass();
@@ -911,14 +912,14 @@ $lang->menu->waterfall->ci = 'Code|repo|browse|';
$lang->menu->waterfall->qa = array('link' => 'QA|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,caselib,');
$lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
$lang->menu->waterfall->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk');
$lang->menu->waterfall->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder');
$lang->menu->waterfall->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->waterfall->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'workestimation,durationestimation,budget,pssp');
$lang->waterfall = new stdclass();
$lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->other = new stdclass();
$lang->waterfall->subMenu->other->issue = 'Issue|issue|browse|';;
$lang->waterfall->subMenu->other->risk = 'Risk|risk|browse|';;
$lang->waterfall->subMenu->other->issue = array('link' => 'Issue|issue|browse|', 'subModule' => 'issue');
$lang->waterfall->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk');
$lang->waterfall->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->setting = new stdclass();
module/common/lang/fr.php
+15 -14
View File
@@ -139,7 +139,7 @@ $lang->mainNav->system = '<i class="icon icon-menu-users"></i> System|custom|es
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,project,repo,';
$lang->dividerMenu = ',project,doc,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap = 'Roadmap|product|roadmap|productID=%s';
$lang->product->viewMenu->dynamic = 'Dynamic|product|dynamic|productID=%s';
$lang->product->viewMenu->project = "Project|product|project|status=all&productID=%s";
$lang->product->viewMenu->doc = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
$lang->product->viewMenu->setting = array('link' => 'Setting|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->viewMenu->set = array('link' => 'Setting|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->settingMenu = new stdclass();
$lang->product->settingMenu->branch = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->settingMenu->module = array('link' => 'Module|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->settingMenu->whitelist = array('link' => 'Whitelist|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->product->setMenu = new stdclass();
$lang->product->setMenu->branch = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->setMenu->module = array('link' => 'Module|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->setMenu->whitelist = array('link' => 'Whitelist|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->release = new stdclass();
$lang->branch = new stdclass();
@@ -740,8 +740,9 @@ $lang->pager->pageOfTotal = "Page <strong>{page}</strong> sur <strong>{totalPag
$lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = "Ce n'est pas une valeur de couleur valide";
global $config;
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label'>Upgrade</span></a>";
$lang->globalLogo = "<img src='{$this->config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "Télécharger la notification sur le bureau";
$lang->downloadClient = "Télécharger ZenTao Desktop";
$lang->clientHelp = "Aide Client";
@@ -885,14 +886,14 @@ $lang->menu->scrum->qa = 'QA|qa|index';
$lang->menu->scrum->ci = 'Code|repo|browse';
$lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
$lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk');
$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->scrum->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list');
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->other = new stdclass();
$lang->scrum->subMenu->other->issue = 'Issue|issue|browse|';;
$lang->scrum->subMenu->other->risk = 'Risk|risk|browse|';;
$lang->scrum->subMenu->other->issue = array('link' => 'Issue|issue|browse|', 'subModule' => 'issue');
$lang->scrum->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk');
$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->scrum->subMenu->setting = new stdclass();
@@ -911,14 +912,14 @@ $lang->menu->waterfall->ci = 'Code|repo|browse|';
$lang->menu->waterfall->qa = array('link' => 'QA|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,caselib,');
$lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
$lang->menu->waterfall->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk');
$lang->menu->waterfall->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder');
$lang->menu->waterfall->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->waterfall->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'workestimation,durationestimation,budget,pssp');
$lang->waterfall = new stdclass();
$lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->other = new stdclass();
$lang->waterfall->subMenu->other->issue = 'Issue|issue|browse|';;
$lang->waterfall->subMenu->other->risk = 'Risk|risk|browse|';;
$lang->waterfall->subMenu->other->issue = array('link' => 'Issue|issue|browse|', 'subModule' => 'issue');
$lang->waterfall->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk');
$lang->waterfall->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->setting = new stdclass();
module/common/lang/vi.php
+14 -13
View File
@@ -139,7 +139,7 @@ $lang->mainNav->system = '<i class="icon icon-menu-users"></i> System|custom|es
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,project,repo,';
$lang->dividerMenu = ',project,doc,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap = 'Roadmap|product|roadmap|productID=%s';
$lang->product->viewMenu->dynamic = 'Dynamic|product|dynamic|productID=%s';
$lang->product->viewMenu->project = "Project|product|project|status=all&productID=%s";
$lang->product->viewMenu->doc = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
$lang->product->viewMenu->setting = array('link' => 'Setting|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->viewMenu->set = array('link' => 'Setting|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->settingMenu = new stdclass();
$lang->product->settingMenu->branch = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->settingMenu->module = array('link' => 'Module|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->settingMenu->whitelist = array('link' => 'Whitelist|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->product->setMenu = new stdclass();
$lang->product->setMenu->branch = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->setMenu->module = array('link' => 'Module|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->setMenu->whitelist = array('link' => 'Whitelist|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->release = new stdclass();
$lang->branch = new stdclass();
@@ -740,8 +740,9 @@ $lang->pager->pageOfTotal = "Page <strong>{page}</strong> of <strong>{totalPage
$lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = 'Not a valid color value';
global $config;
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label'>Upgrade</span></a>";
$lang->globalLogo = "<img src='{$this->config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "Download Desktop Notification";
$lang->downloadClient = "Download ZenTao Desktop";
$lang->clientHelp = "Client Help";
@@ -891,8 +892,8 @@ $lang->menu->scrum->setting = array('link' => 'Setting|project|setting',
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->other = new stdclass();
$lang->scrum->subMenu->other->issue = 'Issue|issue|browse|';;
$lang->scrum->subMenu->other->risk = 'Risk|risk|browse|';;
$lang->scrum->subMenu->other->issue = array('link' => 'Issue|issue|browse|', 'subModule' => 'issue');
$lang->scrum->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk');
$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->scrum->subMenu->setting = new stdclass();
@@ -911,14 +912,14 @@ $lang->menu->waterfall->ci = 'Code|repo|browse|';
$lang->menu->waterfall->qa = array('link' => 'QA|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,caselib,');
$lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
$lang->menu->waterfall->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk');
$lang->menu->waterfall->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder');
$lang->menu->waterfall->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->waterfall->setting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'workestimation,durationestimation,budget,pssp');
$lang->waterfall = new stdclass();
$lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->other = new stdclass();
$lang->waterfall->subMenu->other->issue = 'Issue|issue|browse|';;
$lang->waterfall->subMenu->other->risk = 'Risk|risk|browse|';;
$lang->waterfall->subMenu->other->issue = array('link' => 'Issue|issue|browse|', 'subModule' => 'issue');
$lang->waterfall->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk');
$lang->waterfall->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->setting = new stdclass();
module/common/lang/zh-cn.php
+14 -13
View File
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap = '路线图|product|roadmap|productID=%s'
$lang->product->viewMenu->dynamic = '动态|product|dynamic|productID=%s';
$lang->product->viewMenu->project = "项目|product|project|status=all&productID=%s";
$lang->product->viewMenu->doc = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
$lang->product->viewMenu->setting = array('link' => '设置|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->viewMenu->set = array('link' => '设置|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
$lang->product->settingMenu = new stdclass();
$lang->product->settingMenu->branch = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->settingMenu->module = array('link' => '模块|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->settingMenu->whitelist = array('link' => '白名单|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->product->setMenu = new stdclass();
$lang->product->setMenu->branch = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
$lang->product->setMenu->module = array('link' => '模块|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
$lang->product->setMenu->whitelist = array('link' => '白名单|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
$lang->release = new stdclass();
$lang->branch = new stdclass();
@@ -740,8 +740,9 @@ $lang->pager->pageOfTotal = '第 <strong>{page}</strong>/<strong>{totalPage}</s
$lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = '不是有效的颜色值';
global $config;
$lang->proVersion = "<a href='https://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='btn btn-link'><span class='label'>升级</span></a>";
$lang->globalLogo = "<img src='{$this->config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "下载桌面提醒";
$lang->downloadClient = "下载客户端";
$lang->clientHelp = "客户端使用说明";
@@ -885,14 +886,14 @@ $lang->menu->scrum->qa = '测试|qa|index';
$lang->menu->scrum->ci = '代码|repo|browse';
$lang->menu->scrum->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}');
$lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse');
$lang->menu->scrum->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk');
$lang->menu->scrum->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->scrum->setting = array('link' => '设置|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list');
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->other = new stdclass();
$lang->scrum->subMenu->other->issue = '问题|issue|browse|';;
$lang->scrum->subMenu->other->risk = '风险|risk|browse|';;
$lang->scrum->subMenu->other->issue = array('link' => '问题|issue|browse|', 'subModule' => 'issue');
$lang->scrum->subMenu->other->risk = array('link' => '风险|risk|browse|', 'subModule' => 'risk');
$lang->scrum->subMenu->other->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->scrum->subMenu->setting = new stdclass();
@@ -911,14 +912,14 @@ $lang->menu->waterfall->ci = '代码|repo|browse|';
$lang->menu->waterfall->qa = array('link' => '测试|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,caselib,');
$lang->menu->waterfall->projectrelease = array('link' => '发布|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}');
$lang->menu->waterfall->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk');
$lang->menu->waterfall->setting = array('link' => '设置|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder');
$lang->menu->waterfall->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->waterfall->setting = array('link' => '设置|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'workestimation,durationestimation,budget,pssp');
$lang->waterfall = new stdclass();
$lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->other = new stdclass();
$lang->waterfall->subMenu->other->issue = '问题|issue|browse|';;
$lang->waterfall->subMenu->other->risk = '风险|risk|browse|';;
$lang->waterfall->subMenu->other->issue = array('link' => '问题|issue|browse|', 'subModule' => 'issue');
$lang->waterfall->subMenu->other->risk = array('link' => '风险|risk|browse|', 'subModule' => 'risk');
$lang->waterfall->subMenu->other->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->setting = new stdclass();
module/common/model.php
+2 -2
View File
@@ -803,9 +803,9 @@ class commonModel extends model
if($group == 'repo' || $group == 'ops' || $group == 'feedback') return;
if($group == 'my') self::getMyModuleMenu($moduleName, $methodName);
if($group == 'project') self::getProgramModuleMenu($moduleName);
if($moduleName == 'product' and ($methodName == 'setting' or $methodName == 'addwhitelist'))
if($moduleName == 'product' and ($methodName == 'set' or $methodName == 'addwhitelist'))
{
$lang->product->menu = $lang->product->settingMenu;
$lang->product->menu = $lang->product->setMenu;
self::processMenuVars($lang->product->menu);
}
module/doc/control.php
-2
View File
@@ -112,7 +112,6 @@ class doc extends control
if($from == 'product')
{
$this->lang->navGroup->doc = 'product';
$this->lang->doc->menu = $this->lang->product->menu;
$this->lang->doc->menuOrder = $this->lang->product->menuOrder;
$this->product->setMenu($this->product->getPairs(), $lib->product);
$this->lang->set('menugroup.doc', 'product');
@@ -864,7 +863,6 @@ class doc extends control
if($from == 'product')
{
$this->lang->navGroup->doc = 'product';
$this->lang->doc->menu = $this->lang->product->menu;
$this->lang->doc->menuOrder = $this->lang->product->menuOrder;
$this->product->setMenu($this->product->getPairs(), $objectID);
$this->lang->set('menugroup.doc', 'product');
module/my/view/execution.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
<?php foreach($executions as $execution):?>
<?php $link = $this->createLink('project', 'browse', "id=$execution->id", '', '', $execution->project);?>
<tr class='text-left'>
<td><?php echo html::a($link, $execution->id);?></td>
<td><?php echo html::a($link, sprintf('%03d', $execution->id));?></td>
<td class='c-name text-left'>
<span class='project-type-label label label-info label-outline'>
<?php echo zget($lang->project->typeList, $execution->type);?>
module/product/control.php
+1 -1
View File
@@ -672,7 +672,7 @@ class product extends control
* @access public
* @return void
*/
public function setting($mode = 'branch', $productID)
public function set($mode = 'branch', $productID)
{
$moduleIndex = array_search('product', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
module/product/lang/de.php
+1
View File
@@ -147,6 +147,7 @@ $lang->product->checkedSummary = " <strong>%total%</strong> geprüft, <strong>%e
$lang->product->noModule = '<div>Kein Modul</div><div>Jetzt verwalten</div>';
$lang->product->noProduct = 'Kein Produkt. ';
$lang->product->noMatched = '"%s" kann nicht gefunden werden.' . $lang->productCommon;
$lang->product->DuplicateOrder = "{$lang->productCommon}: The %s sort is duplicated with other {$lang->productCommon} sorts and will not be updated.";
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
module/product/lang/en.php
+1
View File
@@ -147,6 +147,7 @@ $lang->product->checkedSummary = "<strong>%total%</strong> %storyCommon% selecte
$lang->product->noModule = '<div>You have no modules. </div><div>Manage Now</div>';
$lang->product->noProduct = "No {$lang->productCommon} yet. ";
$lang->product->noMatched = '"%s" cannot be found.' . $lang->productCommon;
$lang->product->DuplicateOrder = "{$lang->productCommon}: The %s sort is duplicated with other {$lang->productCommon} sorts and will not be updated.";
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
module/product/lang/fr.php
+1
View File
@@ -147,6 +147,7 @@ $lang->product->checkedSummary = "<strong>%total%</strong> %storyCommon% sélect
$lang->product->noModule = "<div>Vous n'avez aucun modules. </div><div>Gérer Maintenant</div>";
$lang->product->noProduct = "No {$lang->productCommon} à ce jour. ";
$lang->product->noMatched = '"%s" cannot be found.' . $lang->productCommon;
$lang->product->DuplicateOrder = "{$lang->productCommon}: The %s sort is duplicated with other {$lang->productCommon} sorts and will not be updated.";
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
module/product/lang/vi.php
+1
View File
@@ -147,6 +147,7 @@ $lang->product->checkedSummary = "<strong>%total%</strong> stories selected, Esi
$lang->product->noModule = '<div>Chưa có Module. </div><div>Quản lý ngay</div>';
$lang->product->noProduct = "Không có {$lang->productCommon} nào.";
$lang->product->noMatched = '"%s" không thể tìm thấy ' . $lang->productCommon;
$lang->product->DuplicateOrder = "{$lang->productCommon}: The %s sort is duplicated with other {$lang->productCommon} sorts and will not be updated.";
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
module/product/lang/zh-cn.php
+1
View File
@@ -147,6 +147,7 @@ $lang->product->checkedSummary = "选中 <strong>%total%</strong> 个%storyCommo
$lang->product->noModule = "<div>您现在还没有模块信息</div><div>请维护{$lang->productCommon}模块</div>";
$lang->product->noProduct = "暂时没有{$lang->productCommon}。";
$lang->product->noMatched = '找不到包含"%s"的' . $lang->productCommon;
$lang->product->DuplicateOrder = "{$lang->productCommon} ：%s排序与其他{$lang->productCommon}排序重复，将不会被更新。";
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
module/product/model.php
+19 -9
View File
@@ -115,7 +115,7 @@ class productModel extends model
$this->app->loadLang('product');
if(!$productID)
{
unset($this->lang->product->settingMenu->branch);
unset($this->lang->product->setMenu->branch);
return;
}
$isMobile = $this->app->viewType == 'mhtml';
@@ -133,11 +133,11 @@ class productModel extends model
$output .= "</div></div>";
if($isMobile) $output = "<a id='currentItem' href=\"javascript:showSearchMenu('product', '$productID', '$currentModule', '$currentMethod', '$extra')\"><span class='text'>{$currentProduct->name}</span> <span class='icon-caret-down'></span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
if($currentProduct->type == 'normal') unset($this->lang->product->settingMenu->branch);
if($currentProduct->type == 'normal') unset($this->lang->product->setMenu->branch);
if($currentProduct->type != 'normal' && $currentModule != 'programplan')
{
$this->lang->product->branch = $this->lang->product->branchName[$currentProduct->type];
$this->lang->product->settingMenu->branch = str_replace('@branch@', $this->lang->product->branch, $this->lang->product->settingMenu->branch);
$this->lang->product->setMenu->branch = str_replace('@branch@', $this->lang->product->branch, $this->lang->product->setMenu->branch);
$branches = $this->loadModel('branch')->getPairs($productID);
$branchName = isset($branches[$branch]) ? $branches[$branch] : $branches[0];
@@ -608,12 +608,14 @@ class productModel extends model
*/
public function batchUpdate()
{
$products = array();
$allChanges = array();
$data = fixer::input('post')->get();
$oldProducts = $this->getByIdList($this->post->productIDList);
$nameList = array();
$codeList = array();
$products = array();
$allChanges = array();
$data = fixer::input('post')->get();
$oldProducts = $this->getByIdList($this->post->productIDList);
$nameList = array();
$codeList = array();
$message = '';
$productOrders = $this->dao->select("`id`,`order`")->from(TABLE_PRODUCT)->fetchPairs();
foreach($data->productIDList as $productID)
{
$productName = $data->names[$productID];
@@ -638,8 +640,16 @@ class productModel extends model
/* Check unique code for edited products. */
if(isset($codeList[$productCode])) dao::$errors['code'][] = 'product#' . $productID . sprintf($this->lang->error->unique, $this->lang->product->code, $productCode);
$codeList[$productCode] = $productCode;
/* Check unique order for edited products. */
foreach($productOrders as $id => $productOrder)
{
if($id == $productID) continue;
if($productOrder == $data->orders[$productID]) $message .= sprintf($this->lang->product->DuplicateOrder, $productID);
}
}
if(dao::isError()) die(js::error(dao::getError()));
if($message) echo js::alert($message);
foreach($products as $productID => $product)
{
module/product/view/project.html.php
+2 -2
View File
@@ -24,7 +24,7 @@
<p>
<span class="text-muted"><?php echo $lang->project->noProject;?></span>
<?php if(common::hasPriv('project', 'create')):?>
<?php echo html::a($this->createLink('project', 'create', "productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->project->create, '', "class='btn btn-info'");?>
<?php echo html::a($this->createLink('program', 'createGuide'), "<i class='icon icon-plus'></i> " . $lang->project->create, '', "class='btn btn-info iframe'");?>
<?php endif;?>
</p>
</div>
@@ -48,7 +48,7 @@
<?php $id = 0;?>
<?php foreach($projectStats as $project):?>
<tr>
<td class='text-left'><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id), $project->name, '_parent');?></td>
<td class='text-left'><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id, '', false, $project->id), $project->name, '_parent');?></td>
<td><?php echo $project->code;?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
module/testsuite/model.php
+1 -1
View File
@@ -78,7 +78,7 @@ class testsuiteModel extends model
{
if(!$productID)
{
unset($this->lang->product->settingMenu->branch);
unset($this->lang->product->setMenu->branch);
return;
}
module/todo/view/view.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
if($todo->type == 'story') common::printLink('story', 'view', "id={$todo->idvalue}", ' STORY#' . $todo->idvalue);
?>
</div>
<div class='detail-content'><?php echo $todo->desc;?></div>
<div class='detail-content article-content'><?php echo $todo->desc;?></div>
</div>
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=todo&objectID=$todo->id");?>
<?php include '../../common/view/action.html.php';?>
module/user/view/profile.html.php
+1 -1
View File
@@ -19,7 +19,7 @@
<div class='main-header'>
<h2><?php echo $lang->user->profile;?></h2>
<div class='actions pull-right'>
<?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
<?php if(common::hasPriv('user', 'edit')) echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
</div>
</div>
<div class='row'>