diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-06-06 11:30:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 11:30:08 -0500 |
| commit | 72235064fb354f5ab9d07075170a164afc5be6fb (patch) | |
| tree | 901a8cedef601a8acadc9baae7e651a9487a24b1 | |
| parent | 4a3e118adde6968efe43bf3b0a32698e286964ae (diff) | |
| parent | 28e1a9da6cd3bce3cc843727d54094db4969dd7b (diff) | |
| download | nextcloud-server-72235064fb354f5ab9d07075170a164afc5be6fb.tar.gz nextcloud-server-72235064fb354f5ab9d07075170a164afc5be6fb.zip | |
Merge pull request #5259 from nextcloud/disable-groups-on-personal-page
allow admin to disable groups on personal page
| -rw-r--r-- | config/config.sample.php | 5 | ||||
| -rw-r--r-- | settings/personal.php | 1 | ||||
| -rw-r--r-- | settings/templates/personal.php | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 9cff1a4b876..60c184306d4 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1548,4 +1548,9 @@ $CONFIG = array( */ 'gs.federation' => 'internal', +/** + * show group membership on the personal page + */ +'settings.personal.showGroupMembership' => true + ); diff --git a/settings/personal.php b/settings/personal.php index 5a6ff762088..458d1e8d428 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -160,6 +160,7 @@ if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) { $uid = $user->getUID(); $userData = $accountManager->getUser($user); +$tmpl->assign('showGroupMembership', $config->getSystemValue('settings.personal.showGroupMembership', true)); $tmpl->assign('total_space', $totalSpace); $tmpl->assign('usage_relative', $storageInfo['relative']); $tmpl->assign('quota', $storageInfo['quota']); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index f1e2458e55a..d3d45910af5 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -239,6 +239,7 @@ </div> </div> +<?php if ($_['showGroupMembership'] === true): ?> <div id="groups" class="section"> <h2><?php p($l->t('Groups')); ?></h2> <p><?php p($l->t('You are member of the following groups:')); ?></p> @@ -246,6 +247,7 @@ <?php p(implode(', ', $_['groups'])); ?> </p> </div> +<?php endif; ?> <?php if($_['passwordChangeSupported']) { |