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

- Remove PRJ param in url.

Browse Source
This commit is contained in:
zhujinyong
2021-03-17 14:13:22 +08:00
parent e7d17f6e24
commit 691e9392f0
7 changed files with 18 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/helper.class.php
+6 -39
View File
@@ -56,17 +56,14 @@ class baseHelper
* @param string|array $vars the params passed to the method, can be array('key' => 'value') or key1=value1&key2=value2) or key1=value1&key2=value2
* @param string $viewType the view type
* @param bool $onlyBody pass onlyBody=yes to the link thus the app can control the header and footer hide or show..
* @param bool $PRJID set PRJ id in to session.
* @param bool $removePRJ if true, remove PRJ param.
* @static
* @access public
* @return string the link string.
*/
static public function createLink($moduleName, $methodName = 'index', $vars = '', $viewType = '', $onlyBody = false, $PRJID = 0, $removePRJ = false)
static public function createLink($moduleName, $methodName = 'index', $vars = '', $viewType = '', $onlyBody = false)
{
/* 设置$appName和$moduleName。Set appName and moduleName. */
global $app, $config;
$PRJID = $PRJID ? $PRJID : $app->session->PRJ;
if(strpos($moduleName, '.') !== false)
{
@@ -98,8 +95,7 @@ class baseHelper
if($viewType != 'html') $link .= "&{$config->viewVar}=" . $viewType;
foreach($vars as $key => $value) $link .= "&$key=$value";
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
return self::processOnlyBodyParam($link, $onlyBody);
}
/**
@@ -115,7 +111,7 @@ class baseHelper
$link .= '.' . $viewType;
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
return self::processProjectParam($link, $onlyBody, $moduleName);
}
/**
@@ -127,7 +123,7 @@ class baseHelper
{
$link .= $config->default->method . '.' . $viewType;
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
return self::processProjectParam($link, $onlyBody, $moduleName);
}
/**
@@ -139,7 +135,7 @@ class baseHelper
{
$link .= $moduleName . '/';
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
return self::processProjectParam($link, $onlyBody, $moduleName);
}
/**
@@ -148,36 +144,7 @@ class baseHelper
*
*/
$link .= $moduleName . '.' . $viewType;
$link = self::processOnlyBodyParam($link, $onlyBody);
return self::processProjectParam($link, $PRJID, $onlyBody, $moduleName, $removePRJ);
}
/**
* 处理PRJ 参数。
* Process the PRJID param in url.
*
* 如果传参的时候设定了$PRJID，在生成链接的时候继续追加。
* If $progrmID in the url, append it to the link.
*
* @param string $link
* @param int $PRJID
* @param bool $onlybody
* @param string $moduleName
* @param bool $removePRJ
* @static
* @access public
* @return string
*/
public static function processProjectParam($link, $PRJID = '', $onlybody = false, $moduleName = '', $removePRJ = false)
{
global $config, $lang;
if(!$PRJID || $removePRJ) return $link;
$app = zget($lang->navGroup, $moduleName);
if($app != 'project' and $app != 'execution') return $link;
$link .= strpos($link, '?') === false ? "?PRJ=$PRJID" : "&PRJ=$PRJID";
return $link;
return self::processOnlyBodyParam($link, $onlyBody);
}
/**
module/common/lang/en.php
-3
View File
@@ -633,8 +633,6 @@ $lang->navGroup->story = 'product';
$lang->navGroup->tree = 'product';
$lang->navGroup->project = 'project';
$lang->navGroup->qa = 'project';
$lang->navGroup->bug = 'project';
$lang->navGroup->testcase = 'project';
$lang->navGroup->testtask = 'project';
$lang->navGroup->testreport = 'project';
@@ -654,7 +652,6 @@ $lang->navGroup->cm = 'project';
$lang->navGroup->nc = 'project';
$lang->navGroup->projectrelease = 'project';
$lang->navGroup->projectbuild = 'project';
$lang->navGroup->repo = 'project';
$lang->navGroup->job = 'project';
$lang->navGroup->jenkins = 'project';
$lang->navGroup->compile = 'project';
module/common/lang/zh-cn.php
-3
View File
@@ -601,8 +601,6 @@ $lang->navGroup->story = 'product';
$lang->navGroup->tree = 'product';
$lang->navGroup->project = 'project';
$lang->navGroup->qa = 'project';
$lang->navGroup->bug = 'project';
$lang->navGroup->testcase = 'project';
$lang->navGroup->testtask = 'project';
$lang->navGroup->testreport = 'project';
@@ -622,7 +620,6 @@ $lang->navGroup->cm = 'project';
$lang->navGroup->nc = 'project';
$lang->navGroup->projectrelease = 'project';
$lang->navGroup->projectbuild = 'project';
$lang->navGroup->repo = 'project';
$lang->navGroup->job = 'project';
$lang->navGroup->jenkins = 'project';
$lang->navGroup->compile = 'project';
module/common/model.php
+10 -12
View File
@@ -390,18 +390,7 @@ class commonModel extends model
}
else
{
if($group == 'program')
{
$link = helper::createLink($menuItem->link['module'], $menuItem->link['method'], $vars, '', '', $app->session->PRJ);
}
elseif($group == 'product' && $menuItem->name == 'doc')
{
$link = helper::createLink($menuItem->link['module'], $menuItem->link['method'], $vars, '', '', 0, true);
}
else
{
$link = helper::createLink($menuItem->link['module'], $menuItem->link['method'], $vars);
}
$link = helper::createLink($menuItem->link['module'], $menuItem->link['method'], $vars);
}
}
return $link;
@@ -2495,6 +2484,15 @@ EOD;
$lang->$openApp->menu->{$label}['link'] = is_array($menu) ? sprintf($menu['link'], $objectID) : sprintf($menu, $objectID);
}
if($openApp == 'program')
{
foreach($lang->personnel->menu as $label => $menu)
{
$menu['link'] = is_array($menu) ? sprintf($menu['link'], $objectID) : sprintf($menu, $objectID);
$lang->personnel->menu->$label = $menu;
}
}
/* If objectID is set, cannot use homeMenu. */
unset($lang->$openApp->homeMenu);
}
module/personnel/control.php
+1
View File
@@ -73,6 +73,7 @@ class personnel extends control
public function invest($programID = 0)
{
$this->setProgramMenu($programID);
commonModel::setAppObjectID('program', $programID);
$this->view->title = $this->lang->personnel->invest;
$this->view->position[] = $this->lang->personnel->invest;
module/projectbuild/js/browse.js
+1 -1
View File
@@ -3,7 +3,7 @@ $(function()
$('#createBuildButton').on('click', function()
{
var projectID = $('#project').val();
parent.location.href = createLink('build', 'create', 'projectID=' + projectID, '', '', PRJID);
parent.location.href = createLink('build', 'create', 'projectID=' + projectID);
})
});
/**
module/projectbuild/view/browse.html.php
-1
View File
@@ -13,7 +13,6 @@
<?php include '../../common/view/header.html.php';?>
<?php js::set('confirmDelete', $lang->build->confirmDelete)?>
<?php js::set('projectID', $projectID)?>
<?php js::set('PRJID', $this->session->PRJ)?>
<div id="mainMenu" class="clearfix table-row">
<div class="btn-toolbar pull-left">
<?php