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

* Fix open error with metric.

Browse Source
This commit is contained in:
songchenxuan
2023-09-21 21:47:18 +08:00
parent 9487d88055
commit d1d473c307
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/model.php
+17 -6
View File
@@ -1192,15 +1192,26 @@ class metricModel extends model
*/
public function processOldMetrics($metrics)
{
$oldMetricList = $this->getOldMetricList();
$metricList = array();
foreach($metrics as $metric)
if(!in_array($this->config->edition, array('max', 'ipd')))
{
$metric->isOldMetric = $this->isOldMetric($metric);
if($metric->isOldMetric) $metric->unit = $oldMetricList[$metric->fromID]->unit;
foreach($metrics as $metric)
{
$metric->isOldMetric = false;
$metricList[] = $metric;
}
}
else
{
$oldMetricList = $this->getOldMetricList();
$metricList[] = $metric;
foreach($metrics as $metric)
{
$metric->isOldMetric = $this->isOldMetric($metric);
if($metric->isOldMetric) $metric->unit = $oldMetricList[$metric->fromID]->unit;
$metricList[] = $metric;
}
}
return $metricList;
module/upgrade/model.php
+1 -1
View File
@@ -703,7 +703,7 @@ class upgradeModel extends model
$this->removeProductLineRequired();
break;
case '18_7':
if(in_array($this->config->edition, array('max', 'ipd'))) $this->processOldMetrics();
if(!in_array($this->config->edition, array('max', 'ipd'))) $this->processOldMetrics();
break;
}