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

* Finish task#8973.

Browse Source
This commit is contained in:
qiyu-xie
2021-01-14 09:40:26 +08:00
parent 3159469466
commit 1e83bad2b2
7 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/control.php
+8 -14
View File
@@ -406,7 +406,6 @@ class program extends control
$this->program->setPGMViewMenu($programID);
$this->loadModel('datatable');
$this->app->session->set('PRJBrowse', $this->app->getURI(true));
/* Load pager and get tasks. */
$this->app->loadClass('pager', $static = true);
@@ -914,7 +913,7 @@ 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
*/
@@ -925,7 +924,7 @@ class program extends control
$this->loadModel('productplan');
/* Navigation stay in program when enter from program list. */
if($from == 'PGM') $this->lang->PRJ->menu = $this->lang->program->menu;
if($from == 'pgmbrowse' or $from == 'pgmproject') $this->lang->PRJ->menu = $this->lang->program->menu;
if($_POST)
{
@@ -938,23 +937,18 @@ class program extends control
$this->action->logHistory($actionID, $changes);
}
if($from == 'PGM')
{
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('PGMBrowse')));
}
else
{
$url = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse');
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $url));
}
$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));
}
$project = $this->program->getPRJByID($projectID);
$linkedBranches = array();
$productPlans = array(0 => '');
$allProducts = $programID ? $this->program->getPGMProductPairs($programID) : $this->program->getPGMProductPairs($project->parent, 'assign', 'noclosed');
$linkedProducts = $programID ? array() : $this->project->getProducts($projectID);
$allProducts = $programID != $project->parent ? $this->program->getPGMProductPairs($programID) : $this->program->getPGMProductPairs($project->parent, 'assign', 'noclosed');
$linkedProducts = $programID != $project->parent ? array() : $this->project->getProducts($projectID);
foreach($linkedProducts as $product)
{
module/program/model.php
+3 -1
View File
@@ -1707,7 +1707,9 @@ class programModel extends model
echo "</ul>";
echo "</div>";
common::printIcon('program', 'PRJEdit', "projectID=$project->id", $project, 'list', 'edit');
$from = $project->from == 'PRJ' ? 'PRJ' : 'pgmproject';
$dataGroup = $project->from == 'PRJ' ? 'project' : 'program';
common::printIcon('program', 'PRJEdit', "projectID=$project->id&programID=$project->parent&from=$from", $project, 'list', 'edit', '', '', '', "data-group=$dataGroup");
common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'group');
common::printIcon('program', 'PRJGroup', "projectID=$project->id&programID=$programID", $project, 'list', 'lock');
module/program/view/pgmbrowsebylist.html.php
+1 -1
View File
@@ -86,7 +86,7 @@
<?php if($program->status != 'closed') common::printIcon('program', 'PRJActivate', "projectID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
</ul>
</div>
<?php common::printIcon('program', 'PRJEdit', "projectID=$program->id&programID=0&from=PGM", $program, 'list', 'edit', '', '', '', "data-group='program'");?>
<?php common::printIcon('program', 'PRJEdit', "projectID=$program->id&programID=$program->parent&from=pgmbrowse", $program, 'list', 'edit', '', '', '', "data-group='program'");?>
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$program->id", $program, 'list', 'group');?>
<?php common::printIcon('program', 'PRJGroup', "projectID=$program->id", $program, 'list', 'lock');?>
<div class='btn-group'>
module/program/view/pgmproject.html.php
+1
View File
@@ -59,6 +59,7 @@ js::set('browseType', $browseType);
<tbody class="sortable" id='projectTableList'>
<?php foreach($projectStats as $project):?>
<tr data-id="<?php echo $project->id;?>">
<?php $project->from = 'pgmproject';?>
<?php foreach($setting as $value) $this->program->printCell($value, $project, $users, $programID);?>
</tr>
<?php endforeach;?>
module/program/view/prjbrowse.html.php
+1
View File
@@ -77,6 +77,7 @@ js::set('browseType', $browseType);
</thead>
<tbody class="sortable" id='projectTableList'>
<?php foreach($projectStats as $project):?>
<?php $project->from = 'PRJ';?>
<tr data-id="<?php echo $project->id;?>">
<?php foreach($setting as $value) $this->program->printCell($value, $project, $users, $programID);?>
</tr>
module/program/view/prjedit.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
<table class='table table-form'>
<tr>
<th class='w-120px'><?php echo $lang->program->PGMParent;?></th>
<td><?php echo html::select('parent', $programList, $programID ? $programID : $project->parent, "class='form-control chosen' onchange='setParentProgram(this.value)'");?></td>
<td><?php echo html::select('parent', $programList, $programID != $project->parent ? $programID : $project->parent, "class='form-control chosen' onchange='setParentProgram(this.value)'");?></td>
<td></td>
<td></td>
</tr>