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

Merge branch dev/bug-63624 of zentao/zentaopms (#9881)

Browse Source
This commit is contained in:
刘刚
2025-06-25 10:59:44 +08:00
committed by Gitfox
parent 1d117c07e7 5286741bb2
commit 683f9c8366
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/control.php
+1 -1
View File
@@ -176,7 +176,7 @@ class company extends control
/* 根据日期补充动态数据。*/
/* Supplement action by date.*/
$dateGroups = $this->action->buildDateGroup($actions, $direction, $orderBy);
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups && $browseType != 'bysearch') $recTotal = $this->action->getDynamicCount($browseType);
/* Assign.*/
$this->view->title = $this->lang->company->common . $this->lang->hyphen . $this->lang->company->dynamic;
module/execution/control.php
+1 -1
View File
@@ -2623,7 +2623,7 @@ class execution extends control
$date = empty($date) ? '' : date('Y-m-d', (int)$date);
$actions = $this->loadModel('action')->getDynamicByExecution($executionID, $account, $period, $orderBy, 50, $date, $direction);
$dateGroups = $this->action->buildDateGroup($actions, $direction);
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount($period);
$this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->dynamic;
$this->view->userIdPairs = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted|useid');
module/my/control.php
+1 -1
View File
@@ -1477,7 +1477,7 @@ class my extends control
$date = empty($date) ? '' : date('Y-m-d', (int)$date);
$actions = $this->loadModel('action')->getDynamicByAccount($this->app->user->account, $type, $orderBy, 50, $date, $direction);
$dateGroups = $this->action->buildDateGroup($actions, $direction);
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount($type);
/* Assign. */
$this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->dynamic;
module/product/control.php
+1 -1
View File
@@ -518,7 +518,7 @@ class product extends control
/* Get actions. */
list($actions, $dateGroups) = $this->productZen->getActionsForDynamic($account, $orderBy, $productID, $type, $date, $direction);
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount($type == 'account' ? 'all' : $type);
/* Assign. */
$this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->product->dynamic;
module/project/control.php
+1 -1
View File
@@ -775,7 +775,7 @@ class project extends control
$date = empty($date) ? '' : date('Y-m-d', $date);
$actions = $this->loadModel('action')->getDynamicByProject($projectID, $account, $period, $orderBy, 50, $date, $direction);
$dateGroups = $this->action->buildDateGroup($actions, $direction);
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount($period);
/* The header and position. */
$project = $this->project->getByID($projectID);
module/user/control.php
+1 -1
View File
@@ -974,7 +974,7 @@ class user extends control
$date = $date ? date('Y-m-d', $date) : '';
$actions = $this->loadModel('action')->getDynamicByAccount($user->account, $period, $orderBy, 50, $date, $direction);
$dateGroups = $this->action->buildDateGroup($actions, $direction, $period);
if(empty($recTotal) && $dateGroups) $recTotal = count($dateGroups) < 2 ? count($dateGroups, 1) - count($dateGroups) : $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount($period);
/* Assign. */
$this->view->title = $this->lang->user->common . $this->lang->hyphen . $this->lang->user->dynamic;