diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-01-31 16:30:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 16:30:01 +0100 |
| commit | 78c7e6f2c5609122d047a36fc44390b42a341566 (patch) | |
| tree | dfb3b8082ebf4cb9ae08ddcaa799d59b858b8923 /apps | |
| parent | 4765f5b3db6e8e3d2acae19a0c00f616729c1155 (diff) | |
| parent | b68cb1fc0ce9cce0257bcc24d2d6dc41efba7367 (diff) | |
| download | nextcloud-server-78c7e6f2c5609122d047a36fc44390b42a341566.tar.gz nextcloud-server-78c7e6f2c5609122d047a36fc44390b42a341566.zip | |
Merge pull request #19240 from nextcloud/enh/settings/activity_registration
Use activity registration for the settings
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings/appinfo/info.xml | 17 | ||||
| -rw-r--r-- | apps/settings/lib/AppInfo/Application.php | 9 |
2 files changed, 17 insertions, 9 deletions
diff --git a/apps/settings/appinfo/info.xml b/apps/settings/appinfo/info.xml index d77d8690b44..f2325c3afca 100644 --- a/apps/settings/appinfo/info.xml +++ b/apps/settings/appinfo/info.xml @@ -34,4 +34,21 @@ <personal-section>OCA\Settings\Sections\Personal\Security</personal-section> <personal-section>OCA\Settings\Sections\Personal\SyncClients</personal-section> </settings> + + <activity> + <settings> + <setting>OCA\Settings\Activity\GroupSetting</setting> + <setting>OCA\Settings\Activity\SecuritySetting</setting> + <setting>OCA\Settings\Activity\Setting</setting> + </settings> + <filter> + <filter>OCA\Settings\Activity\SecurityFilter</filter> + </filter> + <providers> + <provider>OCA\Settings\Activity\GroupProvider</provider> + <provider>OCA\Settings\Activity\Provider</provider> + <provider>OCA\Settings\Activity\SecurityProvider</provider> + </providers> + + </activity> </info> diff --git a/apps/settings/lib/AppInfo/Application.php b/apps/settings/lib/AppInfo/Application.php index 4f7cbf6b1ee..4d837500c4c 100644 --- a/apps/settings/lib/AppInfo/Application.php +++ b/apps/settings/lib/AppInfo/Application.php @@ -149,15 +149,6 @@ class Application extends App { } public function register() { - $activityManager = $this->getContainer()->getServer()->getActivityManager(); - $activityManager->registerSetting(Setting::class); // FIXME move to info.xml - $activityManager->registerProvider(Provider::class); // FIXME move to info.xml - $activityManager->registerFilter(SecurityFilter::class); // FIXME move to info.xml - $activityManager->registerSetting(SecuritySetting::class); // FIXME move to info.xml - $activityManager->registerProvider(SecurityProvider::class); // FIXME move to info.xml - $activityManager->registerSetting(GroupSetting::class); // FIXME move to info.xml - $activityManager->registerProvider(GroupProvider::class); // FIXME move to info.xml - Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword'); Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo'); |