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

* Finish task#8971.

Browse Source
This commit is contained in:
qiyu-xie
2021-01-14 10:52:19 +08:00
parent c6ab1d3809
commit 47db2287b9
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/zh-cn.php
+1 -1
View File
@@ -153,7 +153,7 @@ $lang->program->menu->browse = array('link' => '项目集|program|pgmbrowse|',
$lang->PRJ = new stdclass();
$lang->PRJ->menu = new stdclass();
$lang->PRJ->menu->browse = array('link' => '项目|program|prjbrowse|', 'alias' => 'prjcreate,prjedit,prjgroup,prjmanagepriv,prjmanageview,prjmanagemembers');
$lang->PRJ->menu->browse = array('link' => '项目|program|prjbrowse|', 'alias' => 'prjcreate,prjedit,prjgroup,prjmanagepriv,prjmanageview,prjmanagemembers,prjmanageproducts');
$lang->program->viewMenu = new stdclass();
$lang->program->viewMenu->product = array('link' => '产品|program|pgmproduct|program=%s', 'alias' => 'view');
module/program/control.php
+19 -12
View File
@@ -924,7 +924,13 @@ class program extends control
$this->loadModel('productplan');
/* Navigation stay in program when enter from program list. */
if($from == 'pgmbrowse' or $from == 'pgmproject') $this->lang->PRJ->menu = $this->lang->program->menu;
if($from == 'pgmbrowse') $this->lang->PRJ->menu = $this->lang->program->menu;
if($from == 'pgmproject')
{
$this->app->rawMethod = 'pgmproject';
$this->lang->program->switcherMenu = $this->program->getPGMSwitcher($programID, true);
$this->program->setPGMViewMenu($programID);
}
if($_POST)
{
@@ -1518,14 +1524,20 @@ class program extends control
*
* @param int $projectID
* @param int $programID
* @param string $from PRJ|PGM
* @param string $from PRJ|pgmbrowse|pgmproject
* @access public
* @return void
*/
public function PRJManageProducts($projectID, $programID = 0, $from = 'PRJ')
{
/* Navigation stay in program when enter from program list. */
if($from == 'PGM') $this->lang->PRJ->menu = $this->lang->program->menu;
if($from == 'pgmbrowse') $this->lang->PRJ->menu = $this->lang->program->menu;
if($from == 'pgmproject')
{
$this->app->rawMethod = 'pgmproject';
$this->lang->program->switcherMenu = $this->program->getPGMSwitcher($programID, true);
$this->program->setPGMViewMenu($programID);
}
if(!empty($_POST))
{
@@ -1545,15 +1557,10 @@ class program extends control
$diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
if($diffProducts) $this->loadModel('action')->create('project', $projectID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
if($from == 'PGM')
{
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('PGMBrowse')));
}
else
{
$browseProjectLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse', "programID=$programID");
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $browseProjectLink));
}
$locateLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse');
if($from == 'pgmbrowse') $locateLink = inLink('PGMBrowse');
if($from == 'pgmproject') $locateLink = inLink('PGMProject', "programID=$programID");
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
}
$this->loadModel('product');
module/program/model.php
+1 -1
View File
@@ -1715,7 +1715,7 @@ class programModel extends model
echo "<div class='btn-group'>";
echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
common::printIcon('program', 'PRJManageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action');
common::printIcon('program', 'PRJManageProducts', "projectID=$project->id&programID=$programID&from=$from", $project, 'list', 'link', '', 'btn-action', '', "data-group=$dataGroup");
common::printIcon('program', 'PRJWhitelist', "projectID=$project->id", $project, 'list', 'shield-check', '', 'btn-action');
if(common::hasPriv('program','PRJDelete')) echo html::a(inLink("PRJDelete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->program->PRJDelete}'");
echo "</ul>";
module/program/view/pgmbrowsebylist.html.php
+1 -1
View File
@@ -92,7 +92,7 @@
<div class='btn-group'>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$program->id&programID=0&from=PGM", $program, 'list', 'link', '', '', '', "data-group='program'");?>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$program->id&programID=0&from=pgmbrowse", $program, 'list', 'link', '', '', '', "data-group='program'");?>
<?php common::printIcon('program', 'PRJWhitelist', "projectID=$program->id", $program, 'list', 'shield-check');?>
<?php if(common::hasPriv('program','PRJDelete')) echo html::a($this->createLink("program", "PRJDelete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PRJDelete}'");?>
</ul>