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

* Adjust code style.

Browse Source
This commit is contained in:
tianshujie98
2020-12-28 15:17:23 +08:00
parent 4b1ae38ac0
commit b8598ce6ce
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/project.html.php
+1 -1
View File
@@ -39,7 +39,7 @@
<th class='c-id w-50px'><?php echo $lang->idAB;?></th>
<th><?php echo $lang->program->PRJName;?></th>
<th class='w-100px'><?php echo $lang->program->PRJCode;?></th>
<th class='w-80px'><?php echo $lang->program->PRJStatus;?></th>
<th class='w-80px'> <?php echo $lang->program->PRJStatus;?></th>
<th class='w-100px'><?php echo $lang->program->begin;?></th>
<th class='w-100px'><?php echo $lang->program->end;?></th>
<th class='w-100px'><?php echo $lang->program->PRJBudget;?></th>
module/product/model.php
+2 -1
View File
@@ -811,7 +811,7 @@ class productModel extends model
* @param int $productID
* @param int $branch
* @access public
* @return void
* @return array
*/
public function getProjectPairsByProduct($productID, $branch = 0)
{
@@ -1222,6 +1222,7 @@ class productModel extends model
foreach($products as $product) $programKeys[] = $product->program;
$programs = $this->dao->select('id,name')->from(TABLE_PROGRAM)
->where('id')->in(array_unique($programKeys))
->andWhere('deleted')->eq('0')
->fetchPairs();
foreach($products as $product) $product->programName = isset($programs[$product->program]) ? $programs[$product->program] : '';
module/productplan/js/browse.js
+2 -2
View File
@@ -22,8 +22,8 @@ $(function()
$('#createExecutionButton').on('click', function()
{
var PRJID = $('#project').val();
var planID = $('#planID').val();
var PRJID = $('#project').val();
var planID = $('#planID').val();
parent.location.href = createLink('project', 'create', 'productID=' + productID + '&projectID=&copyProjectID=&planID=' + planID, '', '', PRJID);
});
});
module/program/view/pgmbrowsebylist.html.php
+2 -2
View File
@@ -71,7 +71,7 @@
</div>
<?php common::printIcon('program', 'PGMEdit', "programID=$program->id", '', 'list', 'edit');?>
<?php common::printIcon('program', 'PGMCreate', "programID=$program->id", '', 'list', 'treemap-alt', '', '', '', '', $this->lang->program->PGMChildren);?>
<?php if(common::hasPriv('program', 'PGMDelete')) echo html::a($this->createLink("program", "pgmdelete", "programID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PGMDelete}'");?>
<?php if(common::hasPriv('program', 'PGMDelete')) echo html::a($this->createLink("program", "PGMDelete", "programID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PGMDelete}'");?>
<?php else:?>
<?php if($program->status == 'wait' || $program->status == 'suspended') common::printIcon('program', 'PRJStart', "projectID=$program->id", $program, 'list', 'play', '', 'iframe', true);?>
@@ -93,7 +93,7 @@
<ul class='dropdown-menu pull-right text-center' role='menu'>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$program->id", $program, 'list', 'menu-project');?>
<?php common::printIcon('program', 'PRJWhitelist', "projectID=$program->id", $program, 'list', 'group');?>
<?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}'");?>
<?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>
</div>
<?php endif;?>