Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable26] fix(UI): Merge UI setting with updatenotifications admin settings #250

Merged
merged 1 commit into from Nov 2, 2023
Merged

[stable26] fix(UI): Merge UI setting with updatenotifications admin settings #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions appinfo/info.xml
View file
Open in desktop
Expand Up @@ -28,8 +28,4 @@
<background-jobs>
<job>OCA\NextcloudAnnouncements\Cron\Crawler</job>
</background-jobs>

<settings>
<admin>OCA\NextcloudAnnouncements\Settings\Admin</admin>
</settings>
</info>
33 changes: 0 additions & 33 deletions js/admin.js
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion lib/Cron/Crawler.php
View file
Open in desktop
Expand Up @@ -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) {
Expand Down
75 changes: 0 additions & 75 deletions lib/Settings/Admin.php
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions templates/admin.php
View file
Open in desktop

This file was deleted.