From 8c3c22aec39ad9e0d6c5eccf4c797dafd03f11b5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 26 Jul 2021 22:08:39 +0100 Subject: [PATCH] Only admin can set shared item federation domains --- webapp_profile.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/webapp_profile.py b/webapp_profile.py index 9e15447d1..d6548cb57 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -1895,6 +1895,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, peertubeStr = '' libretranslateStr = '' graphicsStr = '' + sharesFederationStr = '' adminNickname = getConfigParam(baseDir, 'admin') @@ -1904,6 +1905,10 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, if adminNickname: if path.startswith('/users/' + adminNickname + '/'): + # shared items section + sharesFederationStr = \ + _htmlEditProfileSharedItems(baseDir, nickname, + domain, translate) instanceStr, roleAssignStr, peertubeStr, libretranslateStr = \ _htmlEditProfileInstance(baseDir, translate, peertubeInstances, @@ -1979,15 +1984,12 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, editProfileForm += \ _htmlEditProfileGitProjects(baseDir, nickname, domain, translate) - # shared items section - editProfileForm += \ - _htmlEditProfileSharedItems(baseDir, nickname, domain, translate) - # Skills section editProfileForm += \ _htmlEditProfileSkills(baseDir, nickname, domain, translate) - editProfileForm += roleAssignStr + peertubeStr + graphicsStr + instanceStr + editProfileForm += roleAssignStr + peertubeStr + graphicsStr + editProfileForm += sharesFederationStr + instanceStr # danger zone section editProfileForm += _htmlEditProfileDangerZone(translate)