diff --git a/src/app/versionUpdate/controllers/VersionUpdateController.php b/src/app/versionUpdate/controllers/VersionUpdateController.php index b2341dcb54d8a89c1ede7957c3d7a16b9e73a33f..88837c08ee1b878eaa2b79477636babcc1b0f46f 100755 --- a/src/app/versionUpdate/controllers/VersionUpdateController.php +++ b/src/app/versionUpdate/controllers/VersionUpdateController.php @@ -19,6 +19,7 @@ use Group\models\ServiceModel; use Parameter\models\ParameterModel; use Slim\Http\Request; use Slim\Http\Response; +use SrcCore\models\CoreConfigModel; class VersionUpdateController { @@ -35,12 +36,19 @@ class VersionUpdateController return $response->withJson(['errors' => $e->getMessage()]); } - $parameter = ParameterModel::getById(['select' => ['param_value_string'], 'id' => 'database_version']); + $applicationVersion = CoreConfigModel::getApplicationVersion(); - $currentVersionBranch = substr($parameter['param_value_string'], 0, 5); - $currentVersionBranchYear = substr($parameter['param_value_string'], 0, 2); - $currentVersionBranchMonth = substr($parameter['param_value_string'], 3, 2); - $currentVersionTag = substr($parameter['param_value_string'], 6); + if($applicationVersion) { + $currentVersion = $applicationVersion['applicationMinorVersion']; + } else { + $parameter = ParameterModel::getById(['select' => ['param_value_string'], 'id' => 'database_version']); + $currentVersion = $parameter['param_value_string']; + } + + $currentVersionBranch = substr($currentVersion, 0, 5); + $currentVersionBranchYear = substr($currentVersion, 0, 2); + $currentVersionBranchMonth = substr($currentVersion, 3, 2); + $currentVersionTag = substr($currentVersion, 6); $availableMinorVersions = []; $availableMajorVersions = []; @@ -83,7 +91,7 @@ class VersionUpdateController return $response->withJson([ 'lastAvailableMinorVersion' => $lastAvailableMinorVersion, 'lastAvailableMajorVersion' => $lastAvailableMajorVersion, - 'currentVersion' => $parameter['param_value_string'] + 'currentVersion' => $currentVersion ]); } }