From 106daf1ffe5025a96613a40212904a6586789e35 Mon Sep 17 00:00:00 2001 From: Peter Dulacka Date: Fri, 11 Aug 2023 09:13:22 +0200 Subject: [PATCH] Move system settings configuration to Beam module The settings were not propagated to the Skeleton and were ignored by the Skeleton apps. This could cause schedule commands not being execute due to "notOverlapping" flags, which were written to the Redis correctly. remp/remp#1292 (cherry picked from commit 3c2016476f54bafc5805e0b75090f9e4b80ec840) --- Beam/{ => extensions/beam-module}/config/system.php | 0 Beam/extensions/beam-module/src/BeamServiceProvider.php | 1 + changelogs/CHANGELOG-v3.1.md | 4 ++++ 3 files changed, 5 insertions(+) rename Beam/{ => extensions/beam-module}/config/system.php (100%) diff --git a/Beam/config/system.php b/Beam/extensions/beam-module/config/system.php similarity index 100% rename from Beam/config/system.php rename to Beam/extensions/beam-module/config/system.php diff --git a/Beam/extensions/beam-module/src/BeamServiceProvider.php b/Beam/extensions/beam-module/src/BeamServiceProvider.php index a1b3ef5e7..665318f67 100644 --- a/Beam/extensions/beam-module/src/BeamServiceProvider.php +++ b/Beam/extensions/beam-module/src/BeamServiceProvider.php @@ -84,6 +84,7 @@ public function boot() __DIR__ . '/../public/' => public_path('vendor/beam'), __DIR__ .'/../config/beam.php' => config_path('beam.php'), __DIR__ .'/../config/services.php' => config_path('services.remp.php'), + __DIR__ .'/../config/system.php' => config_path('system.php'), ], ['beam-assets', 'laravel-assets'] ); diff --git a/changelogs/CHANGELOG-v3.1.md b/changelogs/CHANGELOG-v3.1.md index ef0a1dc32..e1a7af85d 100644 --- a/changelogs/CHANGELOG-v3.1.md +++ b/changelogs/CHANGELOG-v3.1.md @@ -1,6 +1,9 @@ ## [3.1] - 2023-07-24 - [3.1.1] [Campaign]: Changed `asset()` function in `showtime.php` to return absolute URL. remp/remp#1282 +- [3.1.2] [Beam]: Fixed schedules not being registered for Skeleton application. remp/remp#1292 +- [3.1.2] [Beam]: Fixed commands not being available to execute for synchronous web event handlers. remp/remp#1292 +- [3.1.2] [Beam]: Refactored system settings configuration so they're available within Beam module and for Skeleton apps. remp/remp#1292 ### [Beam] @@ -28,6 +31,7 @@ --- [3.1.1]: https://github.com/remp2020/remp/compare/3.1.0...3.1.1 +[3.1.2]: https://github.com/remp2020/remp/compare/3.1.1...3.1.2 [Beam]: https://github.com/remp2020/remp/tree/master/Beam [Campaign]: https://github.com/remp2020/remp/tree/master/Campaign