remove ENABLE_USER_CREATE_ORG_REPO

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'

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',

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

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, ''),