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

* [perf story #75387] Adjust for getDynamic method.

Browse Source
This commit is contained in:
wangyidong
2025-06-19 13:11:58 +08:00
parent a5ffd45202
commit 3138bfbbaf
12 changed files with 50 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+20 -101
View File
@@ -1026,11 +1026,6 @@ class actionModel extends model
/* Computer the begin and end date of a period. */
$beginAndEnd = $this->computeBeginAndEnd($period, $date, $direction);
/* 构建权限搜索条件。 */
/* Build has priv search condition. */
$executions = array();
$condition = !$this->app->user->admin ? $this->buildUserAclsSearchCondition($productID, $projectID, $executionID, $executions) : '1=1';
$actionCondition = $this->getActionCondition();
if(!$actionCondition && !$this->app->user->admin && isset($this->app->user->rights['acls']['actions']))
{
@@ -1038,17 +1033,14 @@ class actionModel extends model
return array();
}
$condition = "`objectType` IN ('doc', 'doclib')" . ($condition == '1=1' ? '' : "OR ({$condition})") . " OR `objectType` NOT IN ('program', 'effort')";
$programCondition = empty($this->app->user->view->programs) ? '0' : $this->app->user->view->programs;
$condition .= " OR (`objectID` IN ($programCondition) AND `objectType` = 'program')";
/* 构建权限搜索条件。 */
/* Build has priv search condition. */
$condition = "`objectType` != 'effort'";
$noMultipleExecutions = $this->dao->select('id')->from(TABLE_PROJECT)->where('multiple')->eq(0)->andWhere('type')->in('sprint,kanban')->fetchPairs();
if($noMultipleExecutions) $condition = count($noMultipleExecutions) > 1 ? "({$condition}) AND (`objectType` != 'execution' OR (`objectID` NOT " . helper::dbIN($noMultipleExecutions) . " AND `objectType` = 'execution'))" : "({$condition}) AND (`objectType` != 'execution' OR (`objectID` NOT " . helper::dbIN($noMultipleExecutions) . " AND `objectType` = 'execution'))";
if($noMultipleExecutions) $condition = "({$condition}) AND (`objectType` != 'execution' OR (`objectType` = 'execution' AND `objectID`" . (count($noMultipleExecutions) == 1 ? ' != ' . reset($noMultipleExecutions) : ' NOT ' . helper::dbIN($noMultipleExecutions)) . "))";
$condition = "({$condition})";
$actions = $this->actionTao->getActionListByCondition($condition, $date, $beginAndEnd['begin'], $beginAndEnd['end'], $account, $productID, $projectID, $executionID, $executions, $actionCondition, $orderBy, $limit);
$actions = $this->actionTao->getActionListByCondition("({$condition})", $date, $beginAndEnd['begin'], $beginAndEnd['end'], $account, $productID, $projectID, $executionID, $actionCondition, $orderBy, $limit);
if(!$actions) return array();
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action');
@@ -1072,23 +1064,7 @@ class actionModel extends model
*/
public function getDynamicByProduct(int $productID, string $account = 'all', string $period = 'all', string $orderBy = 'date_desc', int $limit = 50, string $date = '', string $direction = 'next'): array
{
/* 计算时间段的开始和结束时间。 */
/* Computer the begin and end date of a period. */
$beginAndEnd = $this->computeBeginAndEnd($period, $date, $direction);
$actionCondition = $this->getActionCondition();
if(!$actionCondition && !$this->app->user->admin && isset($this->app->user->rights['acls']['actions']))
{
$this->session->set('actionQueryCondition', null, $this->app->tab);
return array();
}
$actions = $this->actionTao->getActionListByCondition('', $date, $beginAndEnd['begin'], $beginAndEnd['end'], $account, $productID, 'all', 'all', array(), $actionCondition, $orderBy, $limit);
if(!$actions) return array();
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action');
return $this->transformActions($actions);
return $this->getDynamic($account, $period, $orderBy, $limit, (int)$productID, 'all', 'all', $date, $direction);
}
/**
@@ -1107,27 +1083,7 @@ class actionModel extends model
*/
public function getDynamicByProject(int $projectID, string $account = 'all', string $period = 'all', string $orderBy = 'date_desc', int $limit = 50, string $date = '', string $direction = 'next'): array
{
/* 计算时间段的开始和结束时间。 */
/* Computer the begin and end date of a period. */
$beginAndEnd = $this->computeBeginAndEnd($period, $date, $direction);
/* 构建权限搜索条件。 */
/* Build has priv search condition. */
$condition = '1=1';
$actionCondition = $this->getActionCondition();
if(!$actionCondition && !$this->app->user->admin && isset($this->app->user->rights['acls']['actions']))
{
$this->session->set('actionQueryCondition', null, $this->app->tab);
return array();
}
$actions = $this->actionTao->getActionListByCondition($condition, $date, $beginAndEnd['begin'], $beginAndEnd['end'], $account, 'all', $projectID, 'all', array(), $actionCondition, $orderBy, $limit);
if(!$actions) return array();
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action');
return $this->transformActions($actions);
return $this->getDynamic($account, $period, $orderBy, $limit, 'all', (int)$projectID, 'all', $date, $direction);
}
/**
@@ -1146,27 +1102,7 @@ class actionModel extends model
*/
public function getDynamicByExecution(int $executionID, string $account = 'all', string $period = 'all', string $orderBy = 'date_desc', int $limit = 50, string $date = '', string $direction = 'next'): array
{
/* 计算时间段的开始和结束时间。 */
/* Computer the begin and end date of a period. */
$beginAndEnd = $this->computeBeginAndEnd($period, $date, $direction);
/* 构建权限搜索条件。 */
/* Build has priv search condition. */
$condition = '1=1';
$actionCondition = $this->getActionCondition();
if(!$actionCondition && !$this->app->user->admin && isset($this->app->user->rights['acls']['actions']))
{
$this->session->set('actionQueryCondition', null, $this->app->tab);
return array();
}
$actions = $this->actionTao->getActionListByCondition($condition, $date, $beginAndEnd['begin'], $beginAndEnd['end'], $account, 'all', 'all', $executionID, array(), $actionCondition, $orderBy, $limit);
if(!$actions) return array();
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action');
return $this->transformActions($actions);
return $this->getDynamic($account, $period, $orderBy, $limit, 'all', 'all', (int)$executionID, $date, $direction);
}
/**
@@ -1185,28 +1121,7 @@ class actionModel extends model
public function getDynamicByAccount(string $account = '', string $period = 'all', string $orderBy = 'date_desc', int $limit = 50, string $date = '', string $direction = 'next'): array
{
if(empty($account)) $account = $this->app->user->account;
/* 计算时间段的开始和结束时间。 */
/* Computer the begin and end date of a period. */
$beginAndEnd = $this->computeBeginAndEnd($period, $date, $direction);
/* 构建权限搜索条件。 */
/* Build has priv search condition. */
$condition = '1=1';
$actionCondition = $this->getActionCondition();
if(!$actionCondition && !$this->app->user->admin && isset($this->app->user->rights['acls']['actions']))
{
$this->session->set('actionQueryCondition', null, $this->app->tab);
return array();
}
$actions = $this->actionTao->getActionListByCondition($condition, $date, $beginAndEnd['begin'], $beginAndEnd['end'], $account, 'all', 'all', 'all', array(), $actionCondition, $orderBy, $limit);
if(!$actions) return array();
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action');
return $this->transformActions($actions);
return $this->getDynamic($account, $period, $orderBy, $limit, 'all', 'all', 'all', $date, $direction);
}
/**
@@ -1278,7 +1193,7 @@ class actionModel extends model
/* If the query condition include all executions, no limit execution. */
if(strpos($actionQuery, $allExecutions) !== false) $actionQuery = str_replace($allExecutions, '1 = 1', $actionQuery);
$actionQuery = str_replace("`product` = '{$productID}'", "`product` LIKE '%,{$productID},%'", $actionQuery);
$actionQuery = str_replace(" `product` = '{$productID}'", " t2.`product` = '{$productID}'", $actionQuery);
if($date) $actionQuery = "({$actionQuery}) AND " . ('date' . ($direction == 'next' ? '<' : '>') . "'{$date}'");
/* 如果当前版本为lite，则过滤掉产品相关的动态。 */
@@ -1305,7 +1220,11 @@ class actionModel extends model
public function getBySQL(string $sql, string $orderBy, int $limit = 50): array
{
$actionCondition = $this->getActionCondition();
return $this->dao->select('*')->from(TABLE_ACTION)
$actionCondition = str_replace(' `action`', ' action.`action`', $actionCondition);
$hasProduct = preg_match('/ t2\.(`?)product/', $sql);
return $this->dao->select('action.*')->from(TABLE_ACTION)->alias('action')
->beginIF($hasProduct)->leftJoin(TABLE_ACTIONPRODUCT)->alias('t2')->on('action.id=t2.action')->fi()
->where($sql)
->beginIF(!empty($actionCondition))->andWhere("($actionCondition)")->fi()
->orderBy($orderBy)
@@ -1986,7 +1905,7 @@ class actionModel extends model
$condition = $this->session->actionQueryCondition;
if(empty($condition)) return false;
$hasProduct = strpos($condition, 't2.product') !== false;
$hasProduct = preg_match('/ t2\.(`?)product/', $condition);
$condition = preg_replace("/AND +`?date`? +(<|>|<=|>=) +'\d{4}\-\d{2}\-\d{2}'/", '', $condition);
$actions = $this->dao->select('action.id')->from(TABLE_ACTION)->alias('action')
->beginIF($hasProduct)->leftJoin(TABLE_ACTIONPRODUCT)->alias('t2')->on('action.id=t2.action')->fi()
@@ -2661,7 +2580,7 @@ class actionModel extends model
if(empty($condition)) return 0;
$table = $this->actionTao->getActionTable($period);
$hasProduct = strpos($condition, 't2.product') !== false;
$hasProduct = preg_match('/ t2\.(`?)product/', $condition);
$actions = $this->dao->select('action.id')->from($table)->alias('action')
->beginIF($hasProduct)->leftJoin(TABLE_ACTIONPRODUCT)->alias('t2')->on('action.id=t2.action')->fi()
@@ -2716,7 +2635,7 @@ class actionModel extends model
$condition = $this->session->actionQueryCondition;
if(empty($condition)) return false;
$hasProduct = strpos($condition, 't2.product') !== false;
$hasProduct = preg_match('/ t2\.(`?)product/', $condition);
$lastDate = substr($lastAction->originalDate, 0, 10);
$condition = preg_replace("/AND +`?date`? +(<|>|<=|>=) +'\d{4}\-\d{2}\-\d{2}'/", '', $condition);
$direction = stripos($this->session->actionOrderBy, ' asc') !== false ? ' > ' : ' < ';
@@ -2746,9 +2665,9 @@ class actionModel extends model
$condition = $this->session->actionQueryCondition;
if(empty($condition)) return array();
$hasProduct = strpos($condition, ' t2.product') !== false;
$hasProduct = preg_match('/ t2\.(`?)product/', $condition);
$lastAction = $this->dao->select('*')->from(TABLE_ACTION)->where('id')->eq($lastActionID)->fetch();
$lastDate = substr($lastAction->date, 0, 10);
$lastDate = substr($lastAction->date, 0, 10);
$direction = stripos($this->session->actionOrderBy, ' asc') !== false ? ' > ' : ' < ';
$actions = $this->dao->select('action.*')->from(TABLE_ACTION)->alias('action')
->beginIF($hasProduct)->leftJoin(TABLE_ACTIONPRODUCT)->alias('t2')->on('action.id=t2.action')->fi()
module/action/tao.php
+3 -4
View File
@@ -686,20 +686,20 @@ class actionTao extends actionModel
* @param string|int $productID
* @param string|int $projectID
* @param string|int $executionID
* @param array $executions
* @param string $actionCondition
* @param string $orderBy
* @param int $limit
* @access public
* @return array|bool
*/
public function getActionListByCondition(string $condition, string $date, string $begin, string $end, string $account, string|int $productID, string|int $projectID, string|int $executionID, array|string $executions, string $actionCondition, string $orderBy, int $limit = 50): array|bool
public function getActionListByCondition(string $condition, string $date, string $begin, string $end, string $account, string|int $productID, string|int $projectID, string|int $executionID, string $actionCondition, string $orderBy, int $limit = 50): array|bool
{
/* 获取最近一个月的动态用actionrecent表。 */
$lastMonth = date('Y-m-d', strtotime('-1 month'));
$actionTable = ($begin >= $lastMonth && $end >= $lastMonth) ? TABLE_ACTIONRECENT : TABLE_ACTION;
$hasProduct = strpos($condition, 't2.product') !== false;
$actionCondition = str_replace(' `action`', ' action.`action`', $actionCondition);
$hasProduct = preg_match('/ t2\.(`?)product/', $condition);
if(is_numeric($productID) && $productID) $hasProduct = true;
if($productID === 'notzero') $hasProduct = true;
@@ -713,7 +713,6 @@ class actionTao extends actionModel
->beginIF($account != 'all')->andWhere('actor')->eq($account)->fi()
->beginIF(is_numeric($productID) && $productID)->andWhere('t2.product')->eq($productID)->fi()
->beginIF(is_numeric($projectID) && $projectID)->andWhere('project')->eq($projectID)->fi()
->beginIF(!empty($executions))->andWhere('execution')->in(array_keys($executions))->fi()
->beginIF(is_numeric($executionID) && $executionID)->andWhere('execution')->eq($executionID)->fi()
/* lite模式下需要排除的一些类型。 */
/* Types excluded from Lite. */
module/action/test/model/builduseraclssearchcondition.php
-46
View File
@@ -1,46 +0,0 @@
#!/usr/bin/env php
<?php
include dirname(__FILE__, 5) . '/test/lib/init.php';
zenData('product')->gen(5);
$project = zenData('project');
$project->project->range('0-4');
$project->parent->range('0-4');
$project->gen(5);
su('admin');
/**
title=测试 actionModel->buildUserAclsSearchCondition();
timeout=0
cid=1
- 执行actionModel模块的buildUserAclsSearchCondition方法，参数是'all', 'all', 'all' @((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product IN ('1','2','3','4')) OR (execution = '0' AND project != '0' AND project IN ('1','2','3','4')) OR (execution != '0' AND execution IN ('5','6','7','8'))
- 执行actionModel模块的buildUserAclsSearchCondition方法，参数是'1', 'all', 'all' @((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = '1') OR (execution = '0' AND project != '0' AND project = '') OR (execution != '0' AND execution = '')
- 执行actionModel模块的buildUserAclsSearchCondition方法，参数是'all', '1', 'all' @((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = 'all') OR (execution = '0' AND project = '1') OR (execution != '0' AND execution = '')
- 执行actionModel模块的buildUserAclsSearchCondition方法，参数是'all', 'all', '5' @((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product IN ('1','2','3','4')) OR (execution = '0' AND project != '0' AND project IN ('1','2','3','4')) OR (execution != '0' AND execution = '5')
- 执行actionModel模块的buildUserAclsSearchCondition方法，参数是'1', '1', 'all' @((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = '1') OR (execution = '0' AND project != '0' AND project = '') OR (execution != '0' AND execution = '')
- 执行actionModel模块的buildUserAclsSearchCondition方法，参数是'1', 'all', '5' @((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = '1') OR (execution = '0' AND project != '0' AND project = '') OR (execution != '0' AND execution = '0')
- 执行actionModel模块的buildUserAclsSearchCondition方法，参数是'1', '4', '5' @((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = '1') OR (execution = '0' AND project != '0' AND project = '') OR (execution != '0' AND execution = '0')
*/
global $tester, $app;
$actionModel = $tester->loadModel('action');
$app->user->admin = true;
$app->user->view = new stdclass();
$app->user->view->products = '1,2,3,4';
$app->user->view->projects = '1,2,3,4';
$app->user->view->sprints = '5,6,7,8';
$app->user->rights['acls'] = array();
$executions = array();
r($actionModel->buildUserAclsSearchCondition('all', 'all', 'all')) && p() && e("((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product IN ('1','2','3','4')) OR (execution = '0' AND project != '0' AND project IN ('1','2','3','4')) OR (execution != '0' AND execution IN ('5','6','7','8'))");
r($actionModel->buildUserAclsSearchCondition('1', 'all', 'all')) && p() && e("((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = '1') OR (execution = '0' AND project != '0' AND project = '') OR (execution != '0' AND execution = '')");
r($actionModel->buildUserAclsSearchCondition('all', '1', 'all')) && p() && e("((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = 'all') OR (execution = '0' AND project = '1') OR (execution != '0' AND execution = '')");
r($actionModel->buildUserAclsSearchCondition('all', 'all', '5')) && p() && e("((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product IN ('1','2','3','4')) OR (execution = '0' AND project != '0' AND project IN ('1','2','3','4')) OR (execution != '0' AND execution = '5')");
r($actionModel->buildUserAclsSearchCondition('1', '1', 'all')) && p() && e("((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = '1') OR (execution = '0' AND project != '0' AND project = '') OR (execution != '0' AND execution = '')");
r($actionModel->buildUserAclsSearchCondition('1', 'all', '5')) && p() && e("((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = '1') OR (execution = '0' AND project != '0' AND project = '') OR (execution != '0' AND execution = '0')");
r($actionModel->buildUserAclsSearchCondition('1', '4', '5')) && p() && e("((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') OR (execution = '0' AND project = '0' AND t2.product = '1') OR (execution = '0' AND project != '0' AND project = '') OR (execution != '0' AND execution = '0')");
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)) $recTotal = !(empty($date) && $browseType == 'all') ? array_sum(array_map('count', $dateGroups)) : $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount();
/* Assign.*/
$this->view->title = $this->lang->company->common . $this->lang->hyphen . $this->lang->company->dynamic;
module/company/ui/dynamic.html.php
+18
View File
@@ -17,6 +17,7 @@ featureBar
(
set::current($browseType),
set::linkParams("browseType={key}&param={$param}&recTotal=0&date=&direction=next&userID={$userID}&productID={$productID}&projectID={$projectID}&executionID={$executionID}&orderBy={$orderBy}"),
set::labelCount($recTotal < \actionModel::MAXCOUNT ? $recTotal : (\actionModel::MAXCOUNT - 1) . '+'),
li
(
setClass('w-28 ml-4'),
@@ -145,6 +146,23 @@ else
);
}
global $app;
$hasMore = $app->control->loadModel('action')->hasMoreAction($lastAction);
if($hasMore)
{
$content[] = li
(
a
(
setID('showMoreDynamic'),
setClass('block text-center'),
setData(array('lastid' => $lastAction->id)),
set::href('###'),
on::click('showMore'),
icon('chevron-double-down')
)
);
}
$content = ul
(
setClass('timeline list-none p-0'),
module/execution/control.php
+1 -1
View File
@@ -2620,7 +2620,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 = count($dateGroups) < 2 ? count($dateGroups, 1) - count($dateGroups) : $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount();
$this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->dynamic;
$this->view->userIdPairs = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted|useid');
module/execution/ui/dynamic.html.php
+1
View File
@@ -16,6 +16,7 @@ featureBar
(
set::current($type),
set::linkParams("executionID={$executionID}&type={key}"),
set::labelCount($recTotal < \actionModel::MAXCOUNT ? $recTotal : (\actionModel::MAXCOUNT - 1) . '+'),
li
(
setClass('w-40'),
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 = count($dateGroups) < 2 ? count($dateGroups, 1) - count($dateGroups) : $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount();
/* Assign. */
$this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->dynamic;
module/my/ui/dynamic.html.php
+2 -1
View File
@@ -14,7 +14,8 @@ namespace zin;
featureBar
(
set::current($type),
set::linkParams('&type={key}')
set::linkParams('&type={key}'),
set::labelCount($recTotal < \actionModel::MAXCOUNT ? $recTotal : (\actionModel::MAXCOUNT - 1) . '+')
);
$content = null;
module/project/control.php
+1 -1
View File
@@ -770,7 +770,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 = count($dateGroups) < 2 ? count($dateGroups, 1) - count($dateGroups) : $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = $this->action->getDynamicCount();
/* The header and position. */
$project = $this->project->getByID($projectID);
module/project/ui/dynamic.html.php
+1
View File
@@ -16,6 +16,7 @@ featureBar
(
set::current($type),
set::linkParams("projectID={$projectID}&type={key}"),
set::labelCount($recTotal < \actionModel::MAXCOUNT ? $recTotal : (\actionModel::MAXCOUNT - 1) . '+'),
li
(
setClass('w-40'),
module/user/ui/dynamic.html.php
+1 -1
View File
@@ -17,7 +17,7 @@ $dynamicNavs = array();
foreach($lang->user->featureBar['dynamic'] as $key => $label) $dynamicNavs[$key] = array('text' => $label, 'url' => inlink('dynamic', "userID={$user->id}&period={$key}"));
if(isset($dynamicNavs[$period]))
{
if(!empty($recTotal)) $dynamicNavs[$period]['badge'] = array('text' => $recTotal, 'class' => 'size-sm canvas ring-0 rounded-md');
if(!empty($recTotal)) $dynamicNavs[$period]['badge'] = array('text' => ($recTotal < \actionModel::MAXCOUNT ? $recTotal : (\actionModel::MAXCOUNT - 1) . '+'), 'class' => 'size-sm canvas ring-0 rounded-md');
$dynamicNavs[$period]['active'] = true;
}