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

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

Browse Source
This commit is contained in:
hufangzhou
2021-03-02 10:16:47 +08:00
parent ffb227243f d0ce1a1fcd
commit 927674932e
27 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+1 -1
View File
@@ -193,7 +193,7 @@ class router extends baseRouter
/* Record system mode. */
$config->systemMode = $mode;
if($config->systemMode == 'old') $this->config->executionCommonList = $this->config->projectCommonList;
if($config->systemMode == 'classic') $this->config->executionCommonList = $this->config->projectCommonList;
/* Record hour unit. */
$config->hourUnit = 'H';
module/action/model.php
+1 -1
View File
@@ -208,7 +208,7 @@ class actionModel extends model
*/
public function getList($objectType, $objectID)
{
if($this->config->systemMode == 'old' and $objectType == 'execution') $objectType = 'project';
if($this->config->systemMode == 'classic' and $objectType == 'execution') $objectType = 'project';
$commiters = $this->loadModel('user')->getCommiters();
$actions = $this->dao->select('*')->from(TABLE_ACTION)
->beginIF($objectType == 'project')
module/common/lang/de.php
+1 -1
View File
@@ -966,7 +966,7 @@ $lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
if($config->systemMode == 'old')
if($config->systemMode == 'classic')
{
$lang->noMenuModule[] = 'project';
$lang->noMenuModule[] = 'task';
module/common/lang/en.php
+1 -1
View File
@@ -966,7 +966,7 @@ $lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
if($config->systemMode == 'old')
if($config->systemMode == 'classic')
{
$lang->noMenuModule[] = 'project';
$lang->noMenuModule[] = 'task';
module/common/lang/fr.php
+1 -1
View File
@@ -966,7 +966,7 @@ $lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
if($config->systemMode == 'old')
if($config->systemMode == 'classic')
{
$lang->noMenuModule[] = 'project';
$lang->noMenuModule[] = 'task';
module/common/lang/vi.php
+1 -1
View File
@@ -965,7 +965,7 @@ $lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
if($config->systemMode == 'old')
if($config->systemMode == 'classic')
{
$lang->noMenuModule[] = 'project';
$lang->noMenuModule[] = 'task';
module/common/lang/zh-cn.php
+1 -1
View File
@@ -964,7 +964,7 @@ $lang->stakeholder->menu->issue = array('link' => '问题管理|stakeholder|issu
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
if($config->systemMode == 'old')
if($config->systemMode == 'classic')
{
$lang->noMenuModule[] = 'project';
$lang->noMenuModule[] = 'task';
module/common/model.php
+1 -1
View File
@@ -1169,7 +1169,7 @@ EOD;
if(strtolower($module) == 'story' and strtolower($method) == 'createcase') ($module = 'testcase') and ($method = 'create');
if(strtolower($module) == 'bug' and strtolower($method) == 'tostory') ($module = 'story') and ($method = 'create');
if(strtolower($module) == 'bug' and strtolower($method) == 'createcase') ($module = 'testcase') and ($method = 'create');
if($config->systemMode == 'old' and strtolower($module) == 'program' and strpos($method, 'PRJ') === 0) ($module = 'project') and ($method = substr(strtolower($method), 3));
if($config->systemMode == 'classic' and strtolower($module) == 'program' and strpos($method, 'PRJ') === 0) ($module = 'project') and ($method = substr(strtolower($method), 3));
if(!commonModel::hasPriv($module, $method, $object)) return false;
$link = helper::createLink($module, $method, $vars, '', $onlyBody, $programID);
module/common/view/header.html.php
+1 -1
View File
@@ -24,7 +24,7 @@ $isQa = $rawModule == 'qa';
<?php if($this->config->systemMode == 'new'):?>
<?php if($isProgram) echo isset($lang->program->switcherMenu) ? $lang->program->switcherMenu : '';?>
<?php if($isProject) echo $this->loadModel('program')->getPRJSwitcher($this->session->PRJ, $app->rawModule, $app->rawMethod);?>
<?php elseif($this->config->systemMode == 'old'):?>
<?php elseif($this->config->systemMode == 'classic'):?>
<?php if($isProject) echo isset($lang->project->switcherMenu) ? $lang->project->switcherMenu : '';;?>
<?php endif;?>
</div>
module/custom/control.php
+1 -1
View File
@@ -553,7 +553,7 @@ class custom extends control
if($mode == 'new') die(js::locate($this->createLink('upgrade', 'mergeTips'), 'parent'));
}
$mode = zget($this->config->global, 'mode', 'old');
$mode = zget($this->config->global, 'mode', 'classic');
if($mode == 'new')
{
if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') $this->locate($this->createLink('upgrade', 'mergeProgram'));
module/custom/view/header.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
{
common::printLink('custom', $sysObject, "", "<span class='text'>{$lang->custom->$sysObject}</span>", '', "class='btn btn-link' id='{$sysObject}Tab'");
}
if((isset($config->systemMode) and $config->systemMode == 'old') || (isset($config->global->upgradeStep) and $config->global->upgradeStep == 'mergeProgram'))
if((isset($config->systemMode) and $config->systemMode == 'classic') || (isset($config->global->upgradeStep) and $config->global->upgradeStep == 'mergeProgram'))
{
common::printLink('custom', 'mode', "", "<span class='text'>{$lang->custom->mode}</span>", '', "class='btn btn-link' id='modeTab'");
}
module/doc/control.php
+6 -6
View File
@@ -125,7 +125,7 @@ class doc extends control
$this->lang->navGroup->doc = 'project';
$this->lang->doc->menu = $this->lang->project->menu;
$this->lang->doc->menuOrder = $this->lang->project->menuOrder;
if($this->config->systemMode == 'old') $this->lang->noMenuModule[] = 'doc';
if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
$this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $lib->project);
$this->lang->set('menugroup.doc', 'project');
}
@@ -362,7 +362,7 @@ class doc extends control
$this->lang->navGroup->doc = 'project';
$this->lang->doc->menu = $this->lang->project->menu;
$this->lang->doc->menuOrder = $this->lang->project->menuOrder;
if($this->config->systemMode == 'old') $this->lang->noMenuModule[] = 'doc';
if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
$this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $lib->project);
$this->lang->set('menugroup.doc', 'project');
@@ -449,7 +449,7 @@ class doc extends control
$this->lang->navGroup->doc = 'project';
$this->lang->doc->menu = $this->lang->project->menu;
$this->lang->doc->menuOrder = $this->lang->project->menuOrder;
if($this->config->systemMode == 'old') $this->lang->noMenuModule[] = 'doc';
if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
$this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID);
$this->lang->set('menugroup.doc', 'project');
}
@@ -515,7 +515,7 @@ class doc extends control
$this->lang->navGroup->doc = 'project';
$this->lang->doc->menu = $this->lang->project->menu;
$this->lang->doc->menuOrder = $this->lang->project->menuOrder;
if($this->config->systemMode == 'old') $this->lang->noMenuModule[] = 'doc';
if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
$this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID);
$this->lang->set('menugroup.doc', 'project');
}
@@ -845,7 +845,7 @@ class doc extends control
$this->lang->navGroup->doc = 'project';
$this->lang->doc->menu = $this->lang->project->menu;
$this->lang->doc->menuOrder = $this->lang->project->menuOrder;
if($this->config->systemMode == 'old') $this->lang->noMenuModule[] = 'doc';
if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
$this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID);
$this->lang->set('menugroup.doc', 'project');
}
@@ -945,7 +945,7 @@ class doc extends control
$this->lang->navGroup->doc = 'project';
$this->lang->doc->menu = $this->lang->project->menu;
$this->lang->doc->menuOrder = $this->lang->project->menuOrder;
if($this->config->systemMode == 'old') $this->lang->noMenuModule[] = 'doc';
if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
$this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID);
$this->lang->set('menugroup.doc', 'project');
}
module/group/control.php
+1 -1
View File
@@ -183,7 +183,7 @@ class group extends control
$group = $this->group->getById($groupID);
$groupPrivs = $this->group->getPrivs($groupID);
if($this->config->systemMode == 'old')
if($this->config->systemMode == 'classic')
{
if(isset($groupPrivs['program']['prjbrowse']))
{
module/group/lang/resource.php
+2 -2
View File
@@ -570,10 +570,10 @@ $lang->resource->project->storySort = 'storySort';
$lang->resource->project->whitelist = 'whitelist';
$lang->resource->project->addWhitelist = 'addWhitelist';
$lang->resource->project->unbindWhielist = 'unbindWhielist';
if($config->systemMode == 'old') $lang->resource->project->list = 'list';
if($config->systemMode == 'classic') $lang->resource->project->list = 'list';
$lang->project->methodOrder[0] = 'index';
if($config->systemMode == 'old') $lang->project->methodOrder[1] = 'list';
if($config->systemMode == 'classic') $lang->project->methodOrder[1] = 'list';
$lang->project->methodOrder[5] = 'view';
$lang->project->methodOrder[10] = 'browse';
$lang->project->methodOrder[15] = 'create';
module/group/model.php
+1 -1
View File
@@ -332,7 +332,7 @@ class groupModel extends model
}
}
if($this->config->systemMode == 'old')
if($this->config->systemMode == 'classic')
{
$prjBrowse = $this->dao->select('module')->from(TABLE_GROUPPRIV)
->where('module')->eq('program')
module/product/control.php
+1 -1
View File
@@ -470,7 +470,7 @@ class product extends control
$lines = array();
if($product->program) $lines = array('') + $this->product->getLinePairs($product->program);
if($this->config->systemMode == 'old') $lines = array('') + $this->product->getLinePairs();
if($this->config->systemMode == 'classic') $lines = array('') + $this->product->getLinePairs();
$this->view->title = $this->lang->product->edit . $this->lang->colon . $product->name;
$this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $product->name);
module/program/model.php
+2 -1
View File
@@ -926,7 +926,8 @@ class programModel extends model
->beginIF($this->config->systemMode == 'new')->andWhere('type')->eq('project')->fi()
->beginIF($browseType != 'all')->andWhere('status')->eq($browseType)->fi()
->beginIF($path)->andWhere('path')->like($path . '%')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(!$this->app->user->admin and $this->config->systemMode == 'new')->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(!$this->app->user->admin and $this->config->systemMode == 'classic')->andWhere('id')->in($this->app->user->view->sprints)->fi()
->beginIF($this->cookie->PRJMine or $PRJMine)
->andWhere('openedBy', true)->eq($this->app->user->account)
->orWhere('PM')->eq($this->app->user->account)
module/project/control.php
+1 -1
View File
@@ -42,7 +42,7 @@ class project extends control
$this->projects = $this->project->getExecutionPairs($this->session->PRJ, 'all', 'nocode');
if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('project', 'create'));
}
$this->objectType = $this->config->systemMode == 'old' ? 'project' : 'exection';
$this->objectType = $this->config->systemMode == 'classic' ? 'project' : 'exection';
}
/**
module/project/model.php
+1 -1
View File
@@ -203,7 +203,7 @@ class projectModel extends model
$currentProjectName = '';
if(isset($currentProject->name)) $currentProjectName = $currentProject->name;
if($this->config->systemMode == 'old')
if($this->config->systemMode == 'classic')
{
$this->session->set('moreProjectLink', $this->app->getURI(true));
$output = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProjectName}'><span class='text'><i class='icon icon-sprint'></i> {$currentProjectName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
module/project/view/manageproducts.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<?php endforeach;?>
</div>
</div>
<?php if($this->config->systemMode == 'old' or $project->grade == 1):?>
<?php if($this->config->systemMode == 'classic' or $project->grade == 1):?>
<div class='detail'>
<div class='detail-title'><?php echo $lang->project->unlinkedProducts;?></div>
<div class='detail-content row'>
module/task/control.php
+2 -2
View File
@@ -206,7 +206,7 @@ class task extends control
$this->view->title = $title;
$this->view->position = $position;
$this->view->project = $project;
$this->view->projects = $this->config->systemMode == 'old' ? $projects : $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
$this->view->projects = $this->config->systemMode == 'classic' ? $projects : $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
$this->view->task = $task;
$this->view->users = $users;
$this->view->stories = $stories;
@@ -392,7 +392,7 @@ class task extends control
$this->view->users = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}");
$this->view->showAllModule = isset($this->config->project->task->allModule) ? $this->config->project->task->allModule : '';
$this->view->modules = $this->tree->getTaskOptionMenu($this->view->task->project, 0, 0, $this->view->showAllModule ? 'allModule' : '');
$this->view->projects = $this->config->systemMode == 'old' ? $this->project->getExecutionPairs() : $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
$this->view->projects = $this->config->systemMode == 'classic' ? $this->project->getExecutionPairs() : $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
$this->display();
}
module/testtask/control.php
+4 -4
View File
@@ -1217,10 +1217,10 @@ class testtask extends control
}
/**
* Ajax get test tasks
*
* @param int $productID
* @param int $projectID
* Ajax get test tasks.
*
* @param int $productID
* @param int $projectID
* @access public
* @return void
*/
module/tree/js/browse.js
+3 -5
View File
@@ -63,15 +63,13 @@ function syncProductOrProject(obj, type)
$('#copyModule').bind('click', function(){syncModule(obj.value, viewType)});
}
function toggleCopy()
function toggleCopy(toggle)
{
var $copy = $('.table-row.copy');
if($copy.size() == 0) return false;
$copy.toggle();
$('.table-row.copy').toggle(toggle);
}
$(document).ready(function()
{
toggleCopy();
toggleCopy(false);
$('[data-id="edit"] a').modalTrigger({type: 'iframe', width: 500});
});
module/tree/view/browse.html.php
+1 -1
View File
@@ -104,7 +104,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete]{display:none;}
<td>
<div id='sonModule'>
<?php if($viewType == 'story' and $allProduct):?>
<div class='table-row row-module copy'>
<div class='table-row row-module copy' style='display: none;'>
<div class='table-col col-module'><?php echo html::select('allProduct', $allProduct, '', "class='form-control chosen' onchange=\"syncProductOrProject(this,'product')\"");?></div>
<div class='table-col col-shorts'><?php echo html::select('productModule', $productModules, '', "class='form-control chosen'");?></div>
<div class='table-col col-actions'>
module/upgrade/lang/zh-cn.php
+4 -4
View File
@@ -73,11 +73,11 @@ $lang->upgrade->mergeProgramDesc = <<<EOD
<p>可以选择这些迭代归属于某个新项目下。</p>
EOD;
$lang->upgrade->to15Mode['old'] = '保持老版本的习惯';
$lang->upgrade->to15Mode['new'] = '全新项目集管理模式';
$lang->upgrade->to15Mode['classic'] = '保持老版本的习惯';
$lang->upgrade->to15Mode['new'] = '全新项目集管理模式';
$lang->upgrade->selectedModeTips['old'] = '后续您还可以在后台-自定义里面切换为全新项目集管理的模式。';
$lang->upgrade->selectedModeTips['new'] = '切换为项目集管理模式需要对之前的数据进行归并处理，系统会引导您完成这个操作。';
$lang->upgrade->selectedModeTips['classic'] = '后续您还可以在后台-自定义里面切换为全新项目集管理的模式。';
$lang->upgrade->selectedModeTips['new'] = '切换为项目集管理模式需要对之前的数据进行归并处理，系统会引导您完成这个操作。';
$lang->upgrade->line = '产品线';
$lang->upgrade->program = '目标项目集和项目';
module/upgrade/view/to15guide.html.php
+2 -2
View File
@@ -18,8 +18,8 @@
<div class='panel-body'>
<div style='width:600px; margin: auto;'>
<?php echo $lang->upgrade->to15Desc;?>
<?php echo html::radio('mode', $lang->upgrade->to15Mode, 'old');?>
<div id='selectedModeTips' class='text-info'><?php echo $lang->upgrade->selectedModeTips['old'];?></div>
<?php echo html::radio('mode', $lang->upgrade->to15Mode, 'classic');?>
<div id='selectedModeTips' class='text-info'><?php echo $lang->upgrade->selectedModeTips['classic'];?></div>
</div>
</div>
<div class='panel-footer text-center'><?php echo html::submitButton();?></div>
module/user/model.php
+3 -4
View File
@@ -1548,7 +1548,7 @@ class userModel extends model
if($allProducts === null) $allProducts = $this->dao->select('id,PO,QD,RD,createdBy,acl,whitelist,program,createdBy')->from(TABLE_PRODUCT)->where('acl')->ne('open')->fetchAll('id');
if($allProjects === null) $allProjects = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,parent,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('project')->fetchAll('id');
if($allPrograms === null) $allPrograms = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('program')->fetchAll('id');
if($allSprints === null) $allSprints = $this->dao->select('id,PO,PM,QD,RD,acl,project,path,parent,type,openedBy')->from(TABLE_PROJECT)->where('acl')->eq('private')->andWhere('type')->in('sprint,stage')->fetchAll('id');
if($allSprints === null) $allSprints = $this->dao->select('id,PO,PM,QD,RD,acl,project,path,parent,type,openedBy')->from(TABLE_PROJECT)->where('acl')->eq('private')->beginIF($this->config->systemMode == 'new')->andWhere('type')->in('sprint,stage')->fi()->fetchAll('id');
/* Get teams. */
if($teams === null)
@@ -1777,9 +1777,8 @@ class userModel extends model
/* Set opened sprints and stages into userview. */
$openedSprints = $this->dao->select('id')->from(TABLE_PROJECT)
->where('acl')->eq('open')
->andWhere('type')
->in('sprint,stage')
->andWhere('project')->in($userView->projects)
->beginIF($this->config->systemMode == 'new')->andWhere('type')->in('sprint,stage')->fi()
->beginIF($this->config->systemMode == 'new')->andWhere('project')->in($userView->projects)->fi()
->fetchAll('id');
$openedSprints = join(',', array_keys($openedSprints));