diff --git a/controllers/BaseController.php b/controllers/BaseController.php index 8935a716..b1e2b8a8 100644 --- a/controllers/BaseController.php +++ b/controllers/BaseController.php @@ -120,7 +120,6 @@ class BaseController $versionInfo = $this->getApplicationService()->GetInstalledVersion(); $this->View->set('version', $versionInfo->Version); - $this->View->set('releaseDate', $versionInfo->ReleaseDate); $localizationService = $this->getLocalizationService(); $this->View->set('__t', function (string $text, ...$placeholderValues) use ($localizationService) { diff --git a/controllers/ExceptionController.php b/controllers/ExceptionController.php index 9e465250..c3746c31 100644 --- a/controllers/ExceptionController.php +++ b/controllers/ExceptionController.php @@ -75,7 +75,7 @@ class ExceptionController extends BaseApiController return $this->renderPage($response->withStatus(500), 'errors/500', [ 'exception' => $exception, - 'system_info' => $this->getApplicationService()->GetSystemInfo() + 'systemInfo' => $this->getApplicationService()->GetSystemInfo() ]); } } diff --git a/controllers/SystemController.php b/controllers/SystemController.php index c5685b21..88177b5b 100644 --- a/controllers/SystemController.php +++ b/controllers/SystemController.php @@ -12,7 +12,8 @@ class SystemController extends BaseController public function About(Request $request, Response $response, array $args) { return $this->renderPage($response, 'about', [ - 'system_info' => $this->getApplicationService()->GetSystemInfo(), + 'systemInfo' => $this->getApplicationService()->GetSystemInfo(), + 'versionInfo' => $this->getApplicationService()->GetInstalledVersion(), 'changelog' => $this->getApplicationService()->GetChangelog() ]); } diff --git a/services/ApplicationService.php b/services/ApplicationService.php index d3e4e653..e86ef58d 100644 --- a/services/ApplicationService.php +++ b/services/ApplicationService.php @@ -53,15 +53,6 @@ class ApplicationService extends BaseService if ($this->InstalledVersion == null) { $this->InstalledVersion = json_decode(file_get_contents(__DIR__ . '/../version.json')); - - if (GROCY_MODE === 'prerelease') - { - $commitHash = trim(exec('git log --pretty="%h" -n1 HEAD')); - $commitDate = trim(exec('git log --date=iso --pretty="%cd" -n1 HEAD')); - - $this->InstalledVersion->Version = "pre-release-$commitHash"; - $this->InstalledVersion->ReleaseDate = substr($commitDate, 0, 19); - } } return $this->InstalledVersion; diff --git a/views/about.blade.php b/views/about.blade.php index 9c78be4b..e688f793 100644 --- a/views/about.blade.php +++ b/views/about.blade.php @@ -27,16 +27,16 @@

- Version {{ $version }}
- {{ $__t('Released on') }} {{ $releaseDate }} + Version {{ $versionInfo->Version }}
+ {{ $__t('Released on') }} {{ $versionInfo->ReleaseDate }}

- PHP Version {{ $system_info['php_version'] }}
- SQLite Version {{ $system_info['sqlite_version'] }}
- OS {{ $system_info['os'] }}
- Client {{ $system_info['client'] }} + PHP Version {{ $systemInfo['php_version'] }}
+ SQLite Version {{ $systemInfo['sqlite_version'] }}
+ OS {{ $systemInfo['os'] }}
+ Client {{ $systemInfo['client'] }}

diff --git a/views/errors/base.blade.php b/views/errors/base.blade.php index 7b4e5322..c155ce77 100644 --- a/views/errors/base.blade.php +++ b/views/errors/base.blade.php @@ -36,7 +36,7 @@ Stack trace: System info: ``` -{!! json_encode($system_info, JSON_PRETTY_PRINT) !!} +{!! json_encode($systemInfo, JSON_PRETTY_PRINT) !!} ```