Skip to content

Commit 94f4c11

Browse files
committed
Added settings texts sync with database
1 parent 17e9e57 commit 94f4c11

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

lib/Migration/AppDataCleanupStep.php

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public function getName(): string {
4747

4848
public function run(IOutput $output) {
4949
$output->startProgress(1);
50-
// $this->cleanupService->dropAppTables();
5150
$this->cleanupService->deleteAppLogs();
5251
$output->advance(1);
5352
$output->finishProgress();

lib/Service/UtilsService.php

+26
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public function __construct(SettingMapper $settingMapper) {
4242
public function checkForSettingsUpdates($app_data) {
4343
$settings = $this->settingMapper->findAll();
4444
if (count($settings) > 0) {
45+
$this->updateSettingsTexts($app_data, $settings);
4546
$this->checkForNewSettings($app_data, $settings);
4647
$this->checkForDeletedSettings($app_data, $settings);
4748
}
@@ -94,4 +95,29 @@ private function checkForDeletedSettings(array $app_data, array $settings): void
9495
}
9596
}
9697
}
98+
99+
private function updateSettingsTexts(array $app_data, array $settings) {
100+
$newSettingsKeys = array_map(function ($setting) {
101+
return $setting['name'];
102+
}, $app_data['settings']);
103+
foreach ($settings as $setting) {
104+
if (in_array($setting->getName(), $newSettingsKeys)) {
105+
$newSetting = null;
106+
foreach ($app_data['settings'] as $s) {
107+
if ($s['name'] == $setting->getName()) {
108+
$newSetting = $s;
109+
}
110+
}
111+
if (isset($newSetting)) {
112+
if ($setting->getDescription() !== $newSetting['description']) {
113+
$setting->setDescription($newSetting['description']);
114+
}
115+
if ($setting->getDisplayName() !== $newSetting['displayName']) {
116+
$setting->setDisplayName($newSetting['displayName']);
117+
}
118+
$this->settingMapper->update($setting);
119+
}
120+
}
121+
}
122+
}
97123
}

0 commit comments

Comments
 (0)