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

Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x

Browse Source
This commit is contained in:
holan20180123
2020-08-26 09:46:50 +08:00
parent f6ec68ffe8 5095245438
commit 7b3c3b65a8
8 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/filter.php
View File

@@ -26,6 +26,7 @@ $filter->default->cookie['lang'] = 'reg::lang';
$filter->default->cookie['theme'] = 'reg::word';
$filter->default->cookie['fingerprint'] = 'reg::word';
$filter->default->cookie['hideMenu'] = 'equal::true';
$filter->default->cookie['systemModel'] = 'code';
$filter->bug = new stdclass();
$filter->caselib = new stdclass();

3
module/action/lang/de.php
View File

@@ -68,6 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['story'] = 'Story';
$lang->action->objectTypes['productplan'] = 'Plan';
$lang->action->objectTypes['release'] = 'Release';
$lang->action->objectTypes['program'] = 'Program';
$lang->action->objectTypes['project'] = $lang->projectCommon;
$lang->action->objectTypes['task'] = 'Aufgabe';
$lang->action->objectTypes['build'] = 'Build';
@@ -386,6 +387,7 @@ $lang->action->label->product = $lang->productCommon . '|product|view|produc
$lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
$lang->action->label->release = 'Release|release|view|productID=%s';
$lang->action->label->story = 'Story|story|view|storyID=%s';
$lang->action->label->program = "Program|program|browse|";
$lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s";
$lang->action->label->task = 'Aufgaben|task|view|taskID=%s';
$lang->action->label->build = 'Builds|build|view|buildID=%s';
@@ -407,6 +409,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s';
/* Object type. */
$lang->action->search->objectTypeList[''] = '';
$lang->action->search->objectTypeList['product'] = $lang->productCommon;
$lang->action->search->objectTypeList['program'] = 'Program';
$lang->action->search->objectTypeList['project'] = $lang->projectCommon;
$lang->action->search->objectTypeList['bug'] = 'Bug';
$lang->action->search->objectTypeList['case'] = 'Fälle';

3
module/action/lang/en.php
View File

@@ -68,6 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['story'] = 'Story';
$lang->action->objectTypes['productplan'] = 'Plan';
$lang->action->objectTypes['release'] = 'Release';
$lang->action->objectTypes['program'] = 'Program';
$lang->action->objectTypes['project'] = $lang->projectCommon;
$lang->action->objectTypes['task'] = 'Task';
$lang->action->objectTypes['build'] = 'Build';
@@ -386,6 +387,7 @@ $lang->action->label->product = $lang->productCommon . '|product|view|produc
$lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
$lang->action->label->release = 'Release|release|view|productID=%s';
$lang->action->label->story = 'Story|story|view|storyID=%s';
$lang->action->label->program = "Program|program|browse|";
$lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s";
$lang->action->label->task = 'Task|task|view|taskID=%s';
$lang->action->label->build = 'Build|build|view|buildID=%s';
@@ -407,6 +409,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s';
/* Object type. */
$lang->action->search->objectTypeList[''] = '';
$lang->action->search->objectTypeList['product'] = $lang->productCommon;
$lang->action->search->objectTypeList['program'] = 'Program';
$lang->action->search->objectTypeList['project'] = $lang->projectCommon;
$lang->action->search->objectTypeList['bug'] = 'Bug';
$lang->action->search->objectTypeList['case'] = 'Case';

3
module/action/lang/fr.php
View File

@@ -68,6 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['story'] = 'Story';
$lang->action->objectTypes['productplan'] = 'Plan';
$lang->action->objectTypes['release'] = 'Release';
$lang->action->objectTypes['program'] = 'Program';
$lang->action->objectTypes['project'] = 'Projet';
$lang->action->objectTypes['task'] = 'Tâche';
$lang->action->objectTypes['build'] = 'Build';
@@ -386,6 +387,7 @@ $lang->action->label->product = $lang->productCommon . '|product|view|produc
$lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
$lang->action->label->release = 'Release|release|view|productID=%s';
$lang->action->label->story = 'Story|story|view|storyID=%s';
$lang->action->label->program = "Program|program|browse|";
$lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s";
$lang->action->label->task = 'Tâche|task|view|taskID=%s';
$lang->action->label->build = 'Build|build|view|buildID=%s';
@@ -407,6 +409,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s';
/* Object type. */
$lang->action->search->objectTypeList[''] = '';
$lang->action->search->objectTypeList['product'] = $lang->productCommon;
$lang->action->search->objectTypeList['program'] = 'Program';
$lang->action->search->objectTypeList['project'] = $lang->projectCommon;
$lang->action->search->objectTypeList['bug'] = 'Bug';
$lang->action->search->objectTypeList['case'] = 'CasTest';

3
module/action/lang/vi.php
View File

@@ -68,6 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['story'] = 'Câu chuyện';
$lang->action->objectTypes['productplan'] = 'Kế hoạch';
$lang->action->objectTypes['release'] = 'Phát hành';
$lang->action->objectTypes['program'] = 'Program';
$lang->action->objectTypes['project'] = $lang->projectCommon;
$lang->action->objectTypes['task'] = 'Nhiệm vụ';
$lang->action->objectTypes['build'] = 'Bản dựng';
@@ -386,6 +387,7 @@ $lang->action->label->product = $lang->productCommon . '|product|view|produc
$lang->action->label->productplan = 'Kế hoạch|productplan|view|productID=%s';
$lang->action->label->release = 'Phát hành|release|view|productID=%s';
$lang->action->label->story = 'Câu chuyện|story|view|storyID=%s';
$lang->action->label->program = "Program|program|browse|";
$lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s";
$lang->action->label->task = 'Nhiệm vụ|task|view|taskID=%s';
$lang->action->label->build = 'Bản dựng|build|view|buildID=%s';
@@ -407,6 +409,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID%s';
/* Object type. */
$lang->action->search->objectTypeList[''] = '';
$lang->action->search->objectTypeList['product'] = $lang->productCommon;
$lang->action->search->objectTypeList['program'] = 'Program';
$lang->action->search->objectTypeList['project'] = $lang->projectCommon;
$lang->action->search->objectTypeList['bug'] = 'Bug';
$lang->action->search->objectTypeList['case'] = 'Tình huống';

12
module/common/lang/zh-cn.php
View File

@@ -144,27 +144,20 @@ $lang->program = new stdclass();
/* System menu. */
$lang->system = new stdclass();
$lang->system->menu = new stdclass();
$lang->system->subMenu = new stdclass();
$lang->system->subMenu->setmodel = new stdclass();
$lang->system->menu->setmodel = array('link' => 'cmmi|custom|setcmmi|', 'class' => 'dropdown dropdown-hover');
$lang->system->menu->estimate = array('link' => '估算|custom|estimate|');
$lang->system->menu->stage = array('link' => '阶段|stage|browse|', 'subModule' => 'stage');
$lang->system->menu->subject = array('link' => '科目|subject|browse|');
$lang->system->menu->holiday = array('link' => '节假日|holiday|browse|');
$lang->system->menu->custom = array('link' => '自定义|custom|plan|');
$lang->system->subMenu->setmodel->scrum ='scrum|custom|setscrum|';
$lang->system->dividerMenu = ',auditcl,subject,';
if($_COOKIE['systemModel'] == 'scrum')
if(isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum')
{
$lang->system->menu = new stdclass();
$lang->system->subMenu->setmodel = new stdclass();
$lang->system->menu->setmodel = array('link' => 'scrum|custom|setscrum|', 'class' => 'dropdown dropdown-hover');
$lang->system->menu->subject = array('link' => '科目|subject|browse|');
$lang->system->menu->holiday = array('link' => '节假日|holiday|browse|');
$lang->system->menu->custom = array('link' => '自定义|custom|concept|');
$lang->system->subMenu->setmodel->cmmi ='cmmi|custom|setcmmi|';
$lang->mainNav->system = '<i class="icon icon-menu-users"></i> 组织|subject|browse|';
unset($lang->system->dividerMenu);
}
@@ -174,6 +167,9 @@ $lang->stage->menu = new stdclass();
$lang->stage->menu->browse = array('link' => '阶段列表|stage|browse|', 'alias' => 'create,edit,batchcreate');
$lang->stage->menu->settype = '阶段类型|stage|settype|';
$lang->measurement = new stdclass();
$lang->measurement->menu = new stdclass();
/* 查询条中可以选择的对象列表。*/
$lang->searchObjects['bug'] = 'Bug';
$lang->searchObjects['story'] = "{$lang->storyCommon}";

2
module/common/view/header.html.php
View File

@@ -15,6 +15,7 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
<?php $this->app->loadConfig('sso');?>
<?php if(!empty($config->sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?>
<?php $isProgram = (zget($lang->navGroup, $app->rawModule) == 'program');?>
<?php $isSystem = (zget($lang->navGroup, $app->rawModule) == 'system');?>
<div id='menu'>
<nav id='menuNav'><?php commonModel::printMainNav($app->rawModule);?></nav>
<div id='menuFooter'>
@@ -26,6 +27,7 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
<div class='container'>
<div id='heading'>
<?php if($isProgram) echo $this->loadModel('program')->getSwapper($this->program->getPairs(), $this->session->program, $app->rawModule, $app->rawMethod);?>
<?php if($isSystem) echo $this->loadModel('custom')->getSwapper();?>
</div>
<nav id='navbar'><?php commonModel::printMainmenu($app->rawModule, $app->rawMethod);?></nav>
<div id='toolbar'>

19
module/custom/model.php
View File

@@ -361,6 +361,25 @@ class customModel extends model
return $allMenu ? self::setMenuByConfig($allMenu, $customMenu) : null;
}
/**
* Get system swapper.
* @param string $module
* @param string $method
* @access public
* @return array
*/
public function getSwapper()
{
$current = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? 'scrum' : 'cmmi';
$link = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? html::a(helper::createLink('custom', 'setcmmi'), 'CMMI') : html::a(helper::createLink('custom', 'setscrum'), 'SCRUM');
$output = "<div class='btn-group' id='swapper'><button data-toggle='dropdown' type='button' class='btn btn-limit' title='{$current}'>{$current} <i class='icon icon-swap'></i></button>";
$output .= "<ul class='dropdown-menu'><li>" . $link . "</li></ul>";
$output .= "</div>";
return $output;
}
/**
* Merge shortcut query in featureBar.
*