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

* [bug#53001,0.5h] fix drill with not use summary.

Browse Source
This commit is contained in:
qixinzhi
2024-07-26 13:48:07 +08:00
committed by 宋辰轩
parent 9c8e48f3c0
commit 90dacdaedc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pivotstate/pivotstate.class.php
+7 -3
View File
@@ -569,8 +569,8 @@ class pivotState
$begin = $default['begin'];
$end = $default['end'];
$begin = date('Y-m-d H:i:s', $begin / 1000);
$end = date('Y-m-d H:i:s', $end / 1000);
if(is_numeric($begin)) $begin = date('Y-m-d H:i:s', $begin / 1000);
if(is_numeric($end)) $end = date('Y-m-d H:i:s', $end / 1000);
$default = array('begin' => $begin, 'end' => $end);
}
@@ -605,7 +605,11 @@ class pivotState
*/
public function completeSettings()
{
if($this->isSummaryNotUse()) return;
if($this->isSummaryNotUse())
{
$this->settings['drills'] = array_column($this->drills, 'condition', 'field');
return;
}
$settings = $this->settings;
if(!isset($settings['summary']) || $settings['summary'] !== 'notuse') $this->settings['summary'] = 'use';