From 5ad72bdcf96f22c779ca207e4a47ef278c86115f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Tue, 11 Apr 2023 16:18:26 +0800 Subject: [PATCH] * Modify task #90919. --- module/dimension/config.php | 2 ++ module/upgrade/model.php | 34 ++++++++++++++-------------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/module/dimension/config.php b/module/dimension/config.php index 4bd5f8ba3f..b20fe47cd4 100644 --- a/module/dimension/config.php +++ b/module/dimension/config.php @@ -3,3 +3,5 @@ $config->dimension->changeDimensionLink = array(); $config->dimension->changeDimensionLink['screen-browse'] = 'screen|browse|dimensionID=%s'; $config->dimension->changeDimensionLink['pivot-preview'] = 'pivot|preview|dimensionID=%s'; $config->dimension->changeDimensionLink['chart-preview'] = 'chart|preview|dimensionID=%s'; + +$config->dimension->defaultDimension = array('efficiency', 'quality'); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 3c27f7aa06..dec08b0f25 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -8210,29 +8210,23 @@ class upgradeModel extends model public function createDefaultDimension() { /* Create default dimension. */ - $this->app->loadLang('dimension'); - $dimension = new stdclass(); - $dimension->name = $this->lang->dimension->efficiency; - $dimension->code = 'efficiency'; - $dimension->desc = ''; - $dimension->createdBy = 'system'; - $dimension->createdDate = helper::now(); + $this->loadModel('dimension'); + foreach($this->config->dimension->defaultDimension as $dimensionName) + { + $dimension = new stdclass(); + $dimension->name = $this->lang->dimension->{$dimensionName}; + $dimension->code = $dimensionName; + $dimension->desc = ''; + $dimension->createdBy = 'system'; + $dimension->createdDate = helper::now(); - $this->dao->insert(TABLE_DIMENSION)->data($dimension)->exec(); - $dimensionID = $this->dao->lastInsertID(); + $this->dao->insert(TABLE_DIMENSION)->data($dimension)->exec(); + $dimensionID = $this->dao->lastInsertID(); - $this->loadModel('upgrade')->addDefaultModules4BI('chart', $dimensionID); - $this->loadModel('upgrade')->addDefaultModules4BI('pivot', $dimensionID); - - $dimension = new stdclass(); - $dimension->name = $this->lang->dimension->quality; - $dimension->code = 'quality'; - $dimension->desc = ''; - $dimension->createdBy = 'system'; - $dimension->createdDate = helper::now(); - - $this->dao->insert(TABLE_DIMENSION)->data($dimension)->exec(); + $this->addDefaultModules4BI('chart', $dimensionID); + $this->addDefaultModules4BI('pivot', $dimensionID); + } return !dao::isError(); }