From 672e93476e48d80c028aa22972ec54f3644d96cf Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Fri, 18 Apr 2014 12:13:43 +0800
Subject: [PATCH] Modify server version updates

---
 seahub/templates/sysadmin/sys_useradmin.html | 2 +-
 seahub/utils/__init__.py                     | 5 +++++
 seahub/views/sysadmin.py                     | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/seahub/templates/sysadmin/sys_useradmin.html b/seahub/templates/sysadmin/sys_useradmin.html
index f6f10dcaf6..4555357f78 100644
--- a/seahub/templates/sysadmin/sys_useradmin.html
+++ b/seahub/templates/sysadmin/sys_useradmin.html
@@ -45,7 +45,7 @@
 $(function(){
     // check if server version is the latest one
     $.ajax({
-        url: 'http://seafile.com/ajax/check_server_version/?v=' + e('{{seafile_version}}') + '&p=' + e('{{platform}}'),
+        url: 'http://seafile.com/ajax/check_server_version/?v=' + e('{{seafile_version}}') + '&p=' + e('{{platform}}') + '&id=' + '{{server_id}}',
         dataType: 'jsonp',
         jsonpCallback: 'xx',
         crossDomain: true,
diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py
index 45db49ef40..0b4236d59e 100644
--- a/seahub/utils/__init__.py
+++ b/seahub/utils/__init__.py
@@ -582,6 +582,11 @@ def get_service_url():
     """
     return SERVICE_URL
 
+def get_server_id():
+    """Get server id from seaserv.
+    """
+    return getattr(seaserv, 'SERVER_ID', '-')
+
 def get_site_scheme_and_netloc():
     """Return a string contains site scheme and network location part from
     service url.
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index 7647c81579..107cee3a43 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -31,7 +31,8 @@ from seahub.share.models import FileShare
 import seahub.settings as settings
 from seahub.settings import INIT_PASSWD, SITE_NAME, \
     SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER, SEND_EMAIL_ON_RESETTING_USER_PASSWD
-from seahub.utils import send_html_email, get_user_traffic_list
+from seahub.utils import send_html_email, get_user_traffic_list, get_server_id
+from seahub.utils.sysinfo import get_platform_name
 
 logger = logging.getLogger(__name__)
 
@@ -185,8 +186,8 @@ def sys_user_admin(request):
 
     have_ldap = True if len(get_emailusers('LDAP', 0, 1)) > 0 else False
 
-    from seahub.utils.sysinfo import get_platform_name
     platform = get_platform_name()
+    server_id = get_server_id()
 
     return render_to_response(
         'sysadmin/sys_useradmin.html', {
@@ -199,6 +200,7 @@ def sys_user_admin(request):
             'CALC_SHARE_USAGE': CALC_SHARE_USAGE,
             'have_ldap': have_ldap,
             'platform': platform,
+            'server_id': server_id,
         },
         context_instance=RequestContext(request))