Merge branch 'sprint/scx_add-default-dimension' into 'master'

* Create default dimension no matter zentao version.

See merge request easycorp/zentaopms!7295
This commit is contained in:
孙广明
2023-04-04 01:11:22 +00:00
+1 -1
View File
@@ -270,7 +270,7 @@ class install extends control
if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) and strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https') $httpType = 'https';
if(isset($_SERVER['REQUEST_SCHEME']) and strtolower($_SERVER['REQUEST_SCHEME']) == 'https') $httpType = 'https';
if(strpos($this->app->getClientLang(), 'zh') === 0) $this->loadModel('api')->createDemoData($this->lang->api->zentaoAPI, "{$httpType}://{$_SERVER['HTTP_HOST']}" . $this->app->config->webRoot . 'api.php/v1', '16.0');
if(($this->config->edition == 'biz' || $this->config->edition == 'max')) $this->loadModel('upgrade')->createDefaultDimension();
$this->loadModel('upgrade')->createDefaultDimension();
return print(js::locate(inlink('step6'), 'parent'));
}