aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2021-06-24 01:46:44 +0200
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2021-10-22 09:55:22 +0000
commit46290e9796d0b0bfe414c6dbad296aa5469b837c (patch)
tree53e32810a1401ff7491e402a45f2d6392963a646
parent7e12517395e203955ece7d1cf0231fe1b5780a84 (diff)
downloadnextcloud-server-46290e9796d0b0bfe414c6dbad296aa5469b837c.tar.gz
nextcloud-server-46290e9796d0b0bfe414c6dbad296aa5469b837c.zip
Hide "federated" scope when Federation app is disabled
If the Federation app is disabled it is not possible to synchronize the users from a different server. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
-rw-r--r--apps/settings/js/federationsettingsview.js7
-rw-r--r--apps/settings/js/settings/personalInfo.js1
-rw-r--r--apps/settings/lib/Settings/Personal/PersonalInfo.php2
-rw-r--r--apps/settings/templates/settings/personal/personal.info.php3
4 files changed, 12 insertions, 1 deletions
diff --git a/apps/settings/js/federationsettingsview.js b/apps/settings/js/federationsettingsview.js
index fd7f3789beb..c5e4b3b3a48 100644
--- a/apps/settings/js/federationsettingsview.js
+++ b/apps/settings/js/federationsettingsview.js
@@ -15,6 +15,8 @@
* @constructs FederationScopeMenu
* @memberof OC.Settings
* @param {object} options
+ * @param {bool} [options.showFederatedScope=false] whether show the
+ * "v2-federated" scope or not
* @param {bool} [options.showPublishedScope=false] whether show the
* "v2-published" scope or not
*/
@@ -32,6 +34,7 @@
} else {
this._config = new OC.Settings.UserSettings();
}
+ this.showFederatedScope = !!options.showFederatedScope;
this.showPublishedScope = !!options.showPublishedScope;
this._inputFields = [
@@ -86,6 +89,10 @@
excludedScopes.push('v2-private');
}
+ if (!self.showFederatedScope) {
+ excludedScopes.push('v2-federated');
+ }
+
if (!self.showPublishedScope) {
excludedScopes.push('v2-published');
}
diff --git a/apps/settings/js/settings/personalInfo.js b/apps/settings/js/settings/personalInfo.js
index 860eb9ed7b2..7a7788ec648 100644
--- a/apps/settings/js/settings/personalInfo.js
+++ b/apps/settings/js/settings/personalInfo.js
@@ -204,6 +204,7 @@ window.addEventListener('DOMContentLoaded', function () {
var federationSettingsView = new OC.Settings.FederationSettingsView({
el: settingsEl,
config: userSettings,
+ showFederatedScope: !!settingsEl.data('federation-enabled'),
showPublishedScope: !!settingsEl.data('lookup-server-upload-enabled'),
});
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
index 7a0253d2be4..a42786b445b 100644
--- a/apps/settings/lib/Settings/Personal/PersonalInfo.php
+++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -87,6 +87,7 @@ class PersonalInfo implements ISettings {
}
public function getForm(): TemplateResponse {
+ $federationEnabled = $this->appManager->isEnabledForUser('federation');
$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
$lookupServerUploadEnabled = false;
if ($federatedFileSharingEnabled) {
@@ -119,6 +120,7 @@ class PersonalInfo implements ISettings {
'usage_relative' => round($storageInfo['relative']),
'quota' => $storageInfo['quota'],
'avatarChangeSupported' => $user->canChangeAvatar(),
+ 'federationEnabled' => $federationEnabled,
'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
'avatarScope' => $account->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope(),
'displayNameChangeSupported' => $user->canChangeDisplayName(),
diff --git a/apps/settings/templates/settings/personal/personal.info.php b/apps/settings/templates/settings/personal/personal.info.php
index eb585c1b684..dd26412cb51 100644
--- a/apps/settings/templates/settings/personal/personal.info.php
+++ b/apps/settings/templates/settings/personal/personal.info.php
@@ -34,7 +34,8 @@ script('settings', [
]);
?>
-<div id="personal-settings" data-lookup-server-upload-enabled="<?php p($_['lookupServerUploadEnabled'] ? 'true' : 'false') ?>">
+<div id="personal-settings" data-federation-enabled="<?php p($_['federationEnabled'] ? 'true' : 'false') ?>"
+ data-lookup-server-upload-enabled="<?php p($_['lookupServerUploadEnabled'] ? 'true' : 'false') ?>">
<h2 class="hidden-visually"><?php p($l->t('Personal info')); ?></h2>
<div id="personal-settings-avatar-container" class="personal-settings-container">
<div>