From 8f1c13e68b94e1490901883c38698b3ecf792b28 Mon Sep 17 00:00:00 2001
From: lian <lian@seafile.com>
Date: Thu, 25 Nov 2021 15:08:50 +0800
Subject: [PATCH] remove ENABLE_USER_CREATE_ORG_REPO

---
 frontend/src/pages/sys-admin/web-settings/web-settings.js | 7 -------
 seahub/api2/endpoints/admin/web_settings.py               | 2 +-
 seahub/base/accounts.py                                   | 3 +--
 seahub/settings.py                                        | 5 -----
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/frontend/src/pages/sys-admin/web-settings/web-settings.js b/frontend/src/pages/sys-admin/web-settings/web-settings.js
index 053f5102f4..c170ee0090 100644
--- a/frontend/src/pages/sys-admin/web-settings/web-settings.js
+++ b/frontend/src/pages/sys-admin/web-settings/web-settings.js
@@ -320,13 +320,6 @@ class WebSettings extends Component {
                       value={config_dict['SHARE_LINK_PASSWORD_STRENGTH_LEVEL']}
                       helpTip={gettext('The level(1-4) of a share/upload link password\'s strength. For example, \'3\' means password must have at least 3 of the following: num, upper letter, lower letter and other symbols')}
                     />
-                    <CheckboxItem
-                      saveSetting={this.saveSetting}
-                      displayName='ENABLE_USER_CREATE_ORG_REPO'
-                      keyText='ENABLE_USER_CREATE_ORG_REPO'
-                      value={config_dict['ENABLE_USER_CREATE_ORG_REPO']}
-                      helpTip={gettext('Allow user to add organization libraries. Otherwise, only system admin can add organization libraries.')}
-                    />
                     <CheckboxItem
                       saveSetting={this.saveSetting}
                       displayName='ENABLE_USER_CLEAN_TRASH'
diff --git a/seahub/api2/endpoints/admin/web_settings.py b/seahub/api2/endpoints/admin/web_settings.py
index c3da1e8ac4..920c84bbd7 100644
--- a/seahub/api2/endpoints/admin/web_settings.py
+++ b/seahub/api2/endpoints/admin/web_settings.py
@@ -25,7 +25,7 @@ DIGIT_WEB_SETTINGS = [
     'ENABLE_ENCRYPTED_LIBRARY', 'USER_PASSWORD_MIN_LENGTH',
     'USER_PASSWORD_STRENGTH_LEVEL', 'SHARE_LINK_PASSWORD_MIN_LENGTH',
     'SHARE_LINK_FORCE_USE_PASSWORD', 'SHARE_LINK_PASSWORD_STRENGTH_LEVEL',
-    'ENABLE_USER_CREATE_ORG_REPO', 'FORCE_PASSWORD_CHANGE',
+    'FORCE_PASSWORD_CHANGE',
     'LOGIN_ATTEMPT_LIMIT', 'FREEZE_USER_ON_LOGIN_FAILED',
     'ENABLE_SHARE_TO_ALL_GROUPS', 'ENABLE_TWO_FACTOR_AUTH',
     'ENABLE_BRANDING_CSS', 'ENABLE_TERMS_AND_CONDITIONS',
diff --git a/seahub/base/accounts.py b/seahub/base/accounts.py
index 337389398b..69f30122aa 100644
--- a/seahub/base/accounts.py
+++ b/seahub/base/accounts.py
@@ -181,8 +181,7 @@ class UserPermissions(object):
                 return False
         elif self.user.is_staff:
             return True
-        elif self._get_perm_by_roles('can_add_public_repo') and \
-                bool(config.ENABLE_USER_CREATE_ORG_REPO):
+        elif self._get_perm_by_roles('can_add_public_repo'):
             return True
         else:
             return False
diff --git a/seahub/settings.py b/seahub/settings.py
index b6be811db6..35528565e4 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -435,9 +435,6 @@ ENABLE_UPDATE_USER_INFO = True
 # Enable or disable repo history setting
 ENABLE_REPO_HISTORY_SETTING = True
 
-# Enable or disable org repo creation by user
-ENABLE_USER_CREATE_ORG_REPO = True
-
 DISABLE_SYNC_WITH_ANY_FOLDER = False
 
 ENABLE_TERMS_AND_CONDITIONS = False
@@ -912,8 +909,6 @@ CONSTANCE_CONFIG = {
     'LOGIN_ATTEMPT_LIMIT': (LOGIN_ATTEMPT_LIMIT, ''),
     'FREEZE_USER_ON_LOGIN_FAILED': (FREEZE_USER_ON_LOGIN_FAILED, ''),
 
-    'ENABLE_USER_CREATE_ORG_REPO': (ENABLE_USER_CREATE_ORG_REPO, ''),
-
     'ENABLE_ENCRYPTED_LIBRARY': (ENABLE_ENCRYPTED_LIBRARY, ''),
     'REPO_PASSWORD_MIN_LENGTH': (REPO_PASSWORD_MIN_LENGTH, ''),
     'ENABLE_REPO_HISTORY_SETTING': (ENABLE_REPO_HISTORY_SETTING, ''),