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

* Fix bug.

Browse Source
This commit is contained in:
leiyong
2020-11-11 11:42:03 +08:00
parent aac9e22af6
commit edc9e1593f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/holiday/view/browse.html.php
+1 -1
View File
@@ -36,7 +36,7 @@
</div>
</div>
<div class='main-col main-table'>
<?php if($holidays):?>
<?php if(!empty($holidays)):?>
<table class='table text-center'>
<thead>
<tr class='text-center'>
module/project/control.php
+2 -2
View File
@@ -2412,7 +2412,7 @@ class project extends control
$this->view->title = $this->lang->project->allProject;
$this->view->position[] = $this->lang->project->allProject;
$this->view->projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, $pager, , $this->session->PRJ);
$this->view->projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, $pager, $this->session->PRJ);
$this->view->products = array(0 => $this->lang->product->select) + $this->loadModel('product')->getProductsByProjec($this->session->PRJ);
$this->view->productID = $productID;
$this->view->projectID = $projectID;
@@ -2505,7 +2505,7 @@ class project extends control
unset($fields[$key]);
}
$projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, null);
$projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, null, $this->session->PRJ);
$users = $this->loadModel('user')->getPairs('noletter');
foreach($projectStats as $i => $project)
{