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

* Fix repo menu.

Browse Source
This commit is contained in:
Yagami
2020-12-25 13:55:16 +08:00
parent 355af26fb5
commit bbf30a2e88
13 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+8 -6
View File
@@ -133,11 +133,12 @@ $lang->mainNav->my = '<i class="icon icon-menu-my"></i> My|my|index|';
$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
$lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
$lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
$lang->mainNav->repo = '<i class="icon icon-code1"></i> Code|repo|browse|';
$lang->mainNav->system = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,';
$lang->dividerMenu = ',admin,project,repo,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly = 'project';
$lang->navGroup->milestone = 'project';
$lang->navGroup->pssp = 'project';
$lang->navGroup->design = 'project';
$lang->navGroup->repo = 'project';
$lang->navGroup->issue = 'project';
$lang->navGroup->risk = 'project';
$lang->navGroup->auditplan = 'project';
$lang->navGroup->cm = 'project';
$lang->navGroup->nc = 'project';
$lang->navGroup->job = 'project';
$lang->navGroup->jenkins = 'project';
$lang->navGroup->compile = 'project';
$lang->navGroup->build = 'project';
$lang->navGroup->projectrelease = 'project';
$lang->navGroup->projectbuild = 'project';
$lang->navGroup->durationestimation = 'project';
$lang->navGroup->repo = 'repo';
$lang->navGroup->job = 'repo';
$lang->navGroup->jenkins = 'repo';
$lang->navGroup->compile = 'repo';
$lang->navGroup->stage = 'system';
$lang->navGroup->measurement = 'system';
$lang->navGroup->report = 'system';
@@ -958,6 +960,6 @@ $lang->projectstory->menu->story = array('link' => "{$lang->projectSRCommo
$lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
include (dirname(__FILE__) . '/menuOrder.php');
module/common/lang/en.php
+8 -6
View File
@@ -133,11 +133,12 @@ $lang->mainNav->my = '<i class="icon icon-menu-my"></i> My|my|index|';
$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
$lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
$lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
$lang->mainNav->repo = '<i class="icon icon-code1"></i> Code|repo|browse|';
$lang->mainNav->system = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,';
$lang->dividerMenu = ',admin,project,repo,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly = 'project';
$lang->navGroup->milestone = 'project';
$lang->navGroup->pssp = 'project';
$lang->navGroup->design = 'project';
$lang->navGroup->repo = 'project';
$lang->navGroup->issue = 'project';
$lang->navGroup->risk = 'project';
$lang->navGroup->auditplan = 'project';
$lang->navGroup->cm = 'project';
$lang->navGroup->nc = 'project';
$lang->navGroup->job = 'project';
$lang->navGroup->jenkins = 'project';
$lang->navGroup->compile = 'project';
$lang->navGroup->build = 'project';
$lang->navGroup->projectrelease = 'project';
$lang->navGroup->projectbuild = 'project';
$lang->navGroup->durationestimation = 'project';
$lang->navGroup->repo = 'repo';
$lang->navGroup->job = 'repo';
$lang->navGroup->jenkins = 'repo';
$lang->navGroup->compile = 'repo';
$lang->navGroup->stage = 'system';
$lang->navGroup->measurement = 'system';
$lang->navGroup->report = 'system';
@@ -958,6 +960,6 @@ $lang->projectstory->menu->story = array('link' => "{$lang->projectSRCommo
$lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
include (dirname(__FILE__) . '/menuOrder.php');
module/common/lang/fr.php
+8 -6
View File
@@ -133,11 +133,12 @@ $lang->mainNav->my = '<i class="icon icon-menu-my"></i> My|my|index|';
$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
$lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
$lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
$lang->mainNav->repo = '<i class="icon icon-code1"></i> Code|repo|browse|';
$lang->mainNav->system = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,';
$lang->dividerMenu = ',admin,project,repo,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly = 'project';
$lang->navGroup->milestone = 'project';
$lang->navGroup->pssp = 'project';
$lang->navGroup->design = 'project';
$lang->navGroup->repo = 'project';
$lang->navGroup->issue = 'project';
$lang->navGroup->risk = 'project';
$lang->navGroup->auditplan = 'project';
$lang->navGroup->cm = 'project';
$lang->navGroup->nc = 'project';
$lang->navGroup->job = 'project';
$lang->navGroup->jenkins = 'project';
$lang->navGroup->compile = 'project';
$lang->navGroup->build = 'project';
$lang->navGroup->projectrelease = 'project';
$lang->navGroup->projectbuild = 'project';
$lang->navGroup->durationestimation = 'project';
$lang->navGroup->repo = 'repo';
$lang->navGroup->job = 'repo';
$lang->navGroup->jenkins = 'repo';
$lang->navGroup->compile = 'repo';
$lang->navGroup->stage = 'system';
$lang->navGroup->measurement = 'system';
$lang->navGroup->report = 'system';
@@ -958,6 +960,6 @@ $lang->projectstory->menu->story = array('link' => "{$lang->projectSRCommo
$lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
include (dirname(__FILE__) . '/menuOrder.php');
module/common/lang/vi.php
+8 -6
View File
@@ -133,11 +133,12 @@ $lang->mainNav->my = '<i class="icon icon-menu-my"></i> My|my|index|';
$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> Program|program|pgmbrowse|';
$lang->mainNav->product = '<i class="icon icon-menu-project"></i> Product|product|index|';
$lang->mainNav->project = '<i class="icon icon-file"></i> Project|program|prjbrowse|';
$lang->mainNav->repo = '<i class="icon icon-code1"></i> Code|repo|browse|';
$lang->mainNav->system = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,';
$lang->dividerMenu = ',admin,project,repo,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly = 'project';
$lang->navGroup->milestone = 'project';
$lang->navGroup->pssp = 'project';
$lang->navGroup->design = 'project';
$lang->navGroup->repo = 'project';
$lang->navGroup->issue = 'project';
$lang->navGroup->risk = 'project';
$lang->navGroup->auditplan = 'project';
$lang->navGroup->cm = 'project';
$lang->navGroup->nc = 'project';
$lang->navGroup->job = 'project';
$lang->navGroup->jenkins = 'project';
$lang->navGroup->compile = 'project';
$lang->navGroup->build = 'project';
$lang->navGroup->projectrelease = 'project';
$lang->navGroup->projectbuild = 'project';
$lang->navGroup->durationestimation = 'project';
$lang->navGroup->repo = 'repo';
$lang->navGroup->job = 'repo';
$lang->navGroup->jenkins = 'repo';
$lang->navGroup->compile = 'repo';
$lang->navGroup->stage = 'system';
$lang->navGroup->measurement = 'system';
$lang->navGroup->report = 'system';
@@ -958,6 +960,6 @@ $lang->projectstory->menu->story = array('link' => "{$lang->projectSRCommo
$lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
include (dirname(__FILE__) . '/menuOrder.php');
module/common/lang/zh-cn.php
+8 -7
View File
@@ -133,11 +133,12 @@ $lang->mainNav->my = '<i class="icon icon-menu-my"></i> 地盘|my|index|';
$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> 项目集|program|pgmbrowse|';
$lang->mainNav->product = '<i class="icon icon-product"></i> 产品|product|index|';
$lang->mainNav->project = '<i class="icon icon-project"></i> 项目|program|prjbrowse|';
$lang->mainNav->repo = '<i class="icon icon-code1"></i> 代码|repo|browse|';
$lang->mainNav->system = '<i class="icon icon-group"></i> 组织|subject|browse|';
$lang->mainNav->admin = '<i class="icon icon-cog-outline"></i> 后台|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,';
$lang->dividerMenu = ',admin,project,repo,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -623,21 +624,22 @@ $lang->navGroup->weekly = 'project';
$lang->navGroup->milestone = 'project';
$lang->navGroup->pssp = 'project';
$lang->navGroup->design = 'project';
$lang->navGroup->repo = 'project';
$lang->navGroup->issue = 'project';
$lang->navGroup->risk = 'project';
$lang->navGroup->auditplan = 'project';
$lang->navGroup->cm = 'project';
$lang->navGroup->nc = 'project';
$lang->navGroup->job = 'project';
$lang->navGroup->jenkins = 'project';
$lang->navGroup->compile = 'project';
$lang->navGroup->build = 'project';
$lang->navGroup->projectrelease = 'project';
$lang->navGroup->projectbuild = 'project';
$lang->navGroup->durationestimation = 'project';
$lang->navGroup->repo = 'repo';
$lang->navGroup->job = 'repo';
$lang->navGroup->jenkins = 'repo';
$lang->navGroup->compile = 'repo';
$lang->navGroup->stage = 'system';
$lang->navGroup->measurement = 'system';
$lang->navGroup->report = 'system';
@@ -891,7 +893,6 @@ $lang->menu->waterfall->weekly = array('link' => '报告|weekly|index|pr
$lang->menu->waterfall->doc = array('link' => '文档|doc|index|project={PROJECT}');
$lang->menu->waterfall->projectstory = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track');
$lang->menu->waterfall->design = '设计|design|browse|product={PRODUCT}';
$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->issue = '问题|issue|browse|';
@@ -958,6 +959,6 @@ $lang->projectstory->menu->story = array('link' => "{$lang->projectSRCommo
$lang->projectstory->menu->track = array('link' => '跟踪矩阵|projectstory|track', 'subModule' => '');
$lang->nc->menu = $lang->auditplan->menu;
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
include (dirname(__FILE__) . '/menuOrder.php');
module/common/model.php
+8 -2
View File
@@ -558,8 +558,8 @@ class commonModel extends model
public static function getRecentExecutions()
{
global $dbh, $lang, $app;
echo '<li><hr></li>';
echo '<li><span id="mainRecent"><i class="icon icon-menu-doc"></i> ' . $lang->recent . '</span></li>';
echo "<li class='divider'></li>";
echo '<li><span id="mainRecent"><i class="icon icon-recent"></i> ' . $lang->recent . '</span></li>';
$extraWhere = empty($app->user->admin) ? ' and id in (' . $app->user->view->sprints . ') and project in (' . $app->user->view->projects . ') ' : '';
@@ -778,6 +778,7 @@ class commonModel extends model
/* Set main menu by group. */
$group = isset($lang->navGroup->$moduleName) ? $lang->navGroup->$moduleName : '';
if($moduleName == 'admin') return;
if($group == 'repo') return;
if($group == 'my') self::getMyModuleMenu($moduleName, $methodName);
if($group == 'project') self::getProgramModuleMenu($moduleName);
@@ -2304,6 +2305,11 @@ EOD;
$lang->menu = $lang->product->menu;
$lang->menuOrder = $lang->product->menuOrder;
}
if($group == 'repo')
{
$lang->menu = $lang->repo->menu;
$lang->menuOrder = $lang->repo->menuOrder;
}
if($group == 'project')
{
$lang->menu = self::getProgramMainMenu($moduleName);
module/repo/control.php
+2 -1
View File
@@ -60,9 +60,10 @@ class repo extends control
$this->view->position[] = $this->lang->repo->common;
$this->view->position[] = $this->lang->repo->browse;
$this->view->repoID = $repoID;
$this->view->repoID = $repoID;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->products = $this->loadModel('product')->getPairs('noclosed');
$this->display();
}
module/repo/lang/de.php
-1
View File
@@ -28,7 +28,6 @@ $lang->repo->submit = 'Submit';
$lang->repo->cancel = 'Cancel';
$lang->repo->addComment = 'Add Comment';
$lang->repo->product = $lang->productCommon;
$lang->repo->module = 'Module';
$lang->repo->type = 'Type';
$lang->repo->assign = 'AssignTo';
module/repo/lang/en.php
-1
View File
@@ -28,7 +28,6 @@ $lang->repo->submit = 'Submit';
$lang->repo->cancel = 'Cancel';
$lang->repo->addComment = 'Add Comment';
$lang->repo->product = $lang->productCommon;
$lang->repo->module = 'Module';
$lang->repo->type = 'Type';
$lang->repo->assign = 'AssignTo';
module/repo/lang/fr.php
-1
View File
@@ -28,7 +28,6 @@ $lang->repo->submit = 'Soumettre';
$lang->repo->cancel = 'Annuler';
$lang->repo->addComment = 'Ajout Comment';
$lang->repo->product = $lang->productCommon;
$lang->repo->module = 'Module';
$lang->repo->type = 'Type';
$lang->repo->assign = 'Assigner à';
module/repo/lang/vi.php
-1
View File
@@ -28,7 +28,6 @@ $lang->repo->submit = 'Gửi';
$lang->repo->cancel = 'Hủy';
$lang->repo->addComment = 'Thêm nhận xét';
$lang->repo->product = $lang->productCommon;
$lang->repo->module = 'Module';
$lang->repo->type = 'Loại';
$lang->repo->assign = 'Giao cho';
module/repo/lang/zh-cn.php
-1
View File
@@ -28,7 +28,6 @@ $lang->repo->submit = '提交';
$lang->repo->cancel = '取消';
$lang->repo->addComment = '添加评论';
$lang->repo->product = $lang->productCommon;
$lang->repo->module = '模块';
$lang->repo->type = '类型';
$lang->repo->assign = '指派';
module/repo/view/maintain.html.php
+10
View File
@@ -20,6 +20,7 @@
<th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->repo->id); ?></th>
<th class='w-120px'><?php common::printOrderLink('SCM', $orderBy, $vars, $lang->repo->type); ?></th>
<th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->repo->name); ?></th>
<th class='w-200px text-left'><?php common::printOrderLink('product', $orderBy, $vars, $lang->repo->product); ?></th>
<th class='text-left'><?php echo $lang->repo->path; ?></th>
<th class='w-100px c-actions-4'><?php echo $lang->actions; ?></th>
</tr>
@@ -30,6 +31,15 @@
<td class='text-center'><?php echo $id; ?></td>
<td class='text'><?php echo zget($lang->repo->scmList, $repo->SCM); ?></td>
<td class='text' title='<?php echo $repo->name; ?>'><?php echo html::a($this->createLink('repo', 'browse', "repoID={$repo->id}"), $repo->name);?></td>
<td class='text'>
<?php
$productList = explode(',', str_replace(' ', '', $repo->product));
if($productList[0])
{
foreach($productList as $productID) echo ' ' . html::a($this->createLink('product', 'browse', "productID=$productID"), zget($products, $productID, $productID));
}
?>
</td>
<td class='text' title='<?php echo $repo->path; ?>'><?php echo $repo->path; ?></td>
<td class='text-left c-actions'>
<?php