haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 19:08:21 +00:00
Code Issues Releases Wiki Activity

Merge branch 'check_new_version' into 4.0

Browse Source
This commit is contained in:
zhengxie
2014-12-25 14:48:32 +08:00
parent 444fc459d0 923925c8ef
commit 67ea9ce75c
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/templates/sysadmin/sys_useradmin.html
View File

@@ -71,7 +71,7 @@
$(function(){ $(function(){
// check if server version is the latest one // check if server version is the latest one
$.ajax({ $.ajax({
url: 'http://seafile.com/ajax/check_server_version/?v=' + e('{{seafile_version}}') + '&p=' + e('{{platform}}') + '&id=' + '{{server_id}}', url: 'http://seafile.com/ajax/check_server_version/?v=' + e('{{seafile_version}}') + '&p=' + e('{{platform}}') + '&id=' + '{{server_id}}' + '&pro=' + '{{pro_server}}',
dataType: 'jsonp', dataType: 'jsonp',
jsonpCallback: 'xx', jsonpCallback: 'xx',
crossDomain: true, crossDomain: true,

6
seahub/utils/__init__.py
View File

@@ -1167,3 +1167,9 @@ def do_urlopen(url, data=None, headers=None):
req = urllib2.Request(url, data=data, headers=headers) req = urllib2.Request(url, data=data, headers=headers)
ret = urllib2.urlopen(req) ret = urllib2.urlopen(req)
return ret return ret
def is_pro_version():
if EVENTS_CONFIG_FILE:
return True
else:
return False

5
seahub/views/sysadmin.py
View File

@@ -24,7 +24,8 @@ from seahub.base.models import UserLastLogin
from seahub.base.decorators import sys_staff_required from seahub.base.decorators import sys_staff_required
from seahub.auth.decorators import login_required, login_required_ajax from seahub.auth.decorators import login_required, login_required_ajax
from seahub.constants import GUEST_USER, DEFAULT_USER from seahub.constants import GUEST_USER, DEFAULT_USER
from seahub.utils import IS_EMAIL_CONFIGURED, string2list, is_valid_username from seahub.utils import IS_EMAIL_CONFIGURED, string2list, is_valid_username, \
is_pro_version
from seahub.views import get_system_default_repo_id from seahub.views import get_system_default_repo_id
from seahub.forms import SetUserQuotaForm, AddUserForm, BatchAddUserForm from seahub.forms import SetUserQuotaForm, AddUserForm, BatchAddUserForm
from seahub.profile.models import Profile, DetailedProfile from seahub.profile.models import Profile, DetailedProfile
@@ -218,6 +219,7 @@ def sys_user_admin(request):
platform = get_platform_name() platform = get_platform_name()
server_id = get_server_id() server_id = get_server_id()
pro_server = 1 if is_pro_version() else 0
return render_to_response( return render_to_response(
'sysadmin/sys_useradmin.html', { 'sysadmin/sys_useradmin.html', {
@@ -234,6 +236,7 @@ def sys_user_admin(request):
'default_user': DEFAULT_USER, 'default_user': DEFAULT_USER,
'guest_user': GUEST_USER, 'guest_user': GUEST_USER,
'enable_guest': ENABLE_GUEST, 'enable_guest': ENABLE_GUEST,
'pro_server': pro_server,
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))
@login_required @login_required