haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-06 01:12:03 +00:00
Code Issues Releases Wiki Activity

rstript service_url (#5997)

Browse Source
This commit is contained in:
欢乐马
2024-03-27 21:25:36 +08:00
committed by GitHub
parent aba296332b
commit 4df02b4eb6
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/pages/sys-admin/web-settings/input-item.js
View File

@@ -23,6 +23,10 @@ class WebSettingInput extends Component {
}; };
} }
UNSAFE_componentWillReceiveProps(nextProps) {
this.setState({value: nextProps.value});
}
toggleBtns = () => { toggleBtns = () => {
this.setState({isBtnsShown: !this.state.isBtnsShown}); this.setState({isBtnsShown: !this.state.isBtnsShown});
}; };

2
scripts/setup-seafile-mysql.py
View File

@@ -1042,7 +1042,7 @@ class SeahubConfigurator(AbstractConfigurator):
fp.write('\n') fp.write('\n')
self.write_secret_key(fp) self.write_secret_key(fp)
fp.write('\n') fp.write('\n')
fp.write('SERVICE_URL = "http://%s/"' % ccnet_config.ip_or_domain) fp.write('SERVICE_URL = "http://%s"' % ccnet_config.ip_or_domain)
fp.write('\n') fp.write('\n')
self.write_database_config(fp) self.write_database_config(fp)

2
scripts/setup-seafile.sh
View File

@@ -543,7 +543,7 @@ if [[ ! -f ${dest_settings_py} ]]; then
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SECRET_KEY = "$key" SECRET_KEY = "$key"
SERVICE_URL = "http://$ip_or_domain/" SERVICE_URL = "http://$ip_or_domain"
EOF EOF
fi fi

3
seahub/api2/endpoints/admin/web_settings.py
View File

@@ -95,6 +95,9 @@ class AdminWebSettings(APIView):
error_msg = 'value invalid.' error_msg = 'value invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
if key in ('SERVICE_URL', 'FILE_SERVER_ROOT'):
value = value.rstrip('/')
try: try:
setattr(config, key, value) setattr(config, key, value)
except AttributeError as e: except AttributeError as e: