From ba55cdde873279c9cdaada883e82d6dc889666d2 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 24 Apr 2015 19:12:14 +0800 Subject: [PATCH] modify service.sh bug --- jumpserver/views.py | 13 +++++++++++ templates/nav_bar_header.html | 42 +++++++++++++++++++++++++++++++++++ version | 1 + 3 files changed, 56 insertions(+) create mode 100644 version diff --git a/jumpserver/views.py b/jumpserver/views.py index 005baa162..0a73f140b 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -8,6 +8,8 @@ from django.http import HttpResponseNotFound from jperm.models import Apply import paramiko from jumpserver.api import * +import uuid +import urllib def getDaysByNum(num): @@ -180,6 +182,17 @@ def pages(posts, r): return contact_list, p, contacts, page_range, current_page, show_first, show_end +def is_latest(request): + node = uuid.getnode() + jsn = uuid.UUID(int=node).hex[-12:] + with open(os.path.join(BASE_DIR, 'version')) as f: + current_version = f.read() + lastest_version = urllib.urlopen('http://www.jumpserver.org/lastest_version.html?jsn=%s' % jsn).read().strip() + + if current_version != lastest_version: + pass + + def login(request): """登录界面""" if request.session.get('username'): diff --git a/templates/nav_bar_header.html b/templates/nav_bar_header.html index d676b1bed..4377d034a 100644 --- a/templates/nav_bar_header.html +++ b/templates/nav_bar_header.html @@ -52,6 +52,48 @@ {% endif %} +
  • + + 8 + + +
  • Log out diff --git a/version b/version new file mode 100644 index 000000000..b123147e2 --- /dev/null +++ b/version @@ -0,0 +1 @@ +1.1 \ No newline at end of file