Merge pull request #249 from nextcloud/backport/248/stable27

[stable27] fix(UI): Merge UI setting with updatenotifications admin settings
nextcloud · Nov 2, 2023 · 4751e65 · 4751e65
2 parents 02d0dfb + 54299a7
commit 4751e65
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 151 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -28,8 +28,4 @@
 	<background-jobs>
 		<job>OCA\NextcloudAnnouncements\Cron\Crawler</job>
 	</background-jobs>
-
-	<settings>
-		<admin>OCA\NextcloudAnnouncements\Settings\Admin</admin>
-	</settings>
 </info>
diff --git a/js/admin.js b/js/admin.js
diff --git a/lib/Cron/Crawler.php b/lib/Cron/Crawler.php
@@ -214,7 +214,11 @@ protected function getUsersToNotify() {
 			return array_keys($this->notifyUsers);
 		}
 
-		$groups = $this->config->getAppValue($this->appName, 'notification_groups', '["admin"]');
+		$groups = $this->config->getAppValue($this->appName, 'notification_groups', '');
+		if ($groups === '') {
+			// Fallback to the update notifications when not explicitly configured back in the days when this app had a UI
+			$groups = $this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]');
+		}
 		$groups = json_decode($groups, true);
 
 		if ($groups === null) {

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
diff --git a/templates/admin.php b/templates/admin.php