From d284c2175d9e8be54d717e6897153ad06eb3d6f1 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 2 Mar 2018 15:39:01 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/templates/assets/asset_list.html | 12 +++++----- apps/common/mixins.py | 5 ++--- apps/common/templatetags/common_tags.py | 23 +++++++++++--------- apps/templates/_header_bar.html | 2 +- apps/users/templates/users/login.html | 8 +++++-- apps/users/views/login.py | 10 ++++++++- 6 files changed, 37 insertions(+), 23 deletions(-) diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 4933b26e2..553014de2 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -2,6 +2,12 @@ {% load static %} {% load i18n %} +{% block help_message %} +
+ 左侧是资产树，右击可以新建、删除、更改树节点，授权资产也是以节点方式组织的，右侧是属于该节点下的资产 +
+{% endblock %} + {% block custom_head_css_js %} @@ -321,12 +327,6 @@ function onDrag(event, treeId, treeNodes) { } function onDrop(event, treeId, treeNodes, targetNode, moveType) { - console.log("DROP"); - console.log(event); - console.log(treeNodes); - console.log(targetNode); - console.log(moveType); - var treeNodesNames = []; var treeNodesIds = []; $.each(treeNodes, function (index, value) { diff --git a/apps/common/mixins.py b/apps/common/mixins.py index 57509af6c..243ee93c6 100644 --- a/apps/common/mixins.py +++ b/apps/common/mixins.py @@ -99,9 +99,8 @@ class DatetimeSearchMixin: if date_from_s: date_from = timezone.datetime.strptime(date_from_s, self.date_format) - self.date_from = date_from.replace( - tzinfo=timezone.get_current_timezone() - ) + tz = timezone.get_current_timezone() + self.date_from = tz.localize(date_from) else: self.date_from = timezone.now() - timezone.timedelta(7) diff --git a/apps/common/templatetags/common_tags.py b/apps/common/templatetags/common_tags.py index 747868430..9123ecef8 100644 --- a/apps/common/templatetags/common_tags.py +++ b/apps/common/templatetags/common_tags.py @@ -73,17 +73,20 @@ def to_html(s): @register.filter def time_util_with_seconds(date_from, date_to): - if date_from and date_to: - delta = date_to - date_from - seconds = delta.seconds - if seconds < 60: - return '{} s'.format(seconds) - elif seconds < 60*60: - return '{} m'.format(seconds//60) - else: - return '{} h'.format(seconds//3600) - else: + if not date_from: return '' + if not date_to: + return '' + date_to = timezone.now() + + delta = date_to - date_from + seconds = delta.seconds + if seconds < 60: + return '{} s'.format(seconds) + elif seconds < 60*60: + return '{} m'.format(seconds//60) + else: + return '{} h'.format(seconds//3600) @register.filter diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html index 9c72fe38b..712f2eece 100644 --- a/apps/templates/_header_bar.html +++ b/apps/templates/_header_bar.html @@ -14,7 +14,7 @@ {# {% trans 'Welcome to use Jumpserver system' %}#} {# #}
  • - + {% trans 'Supports' %}
    • diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html index 1f6498370..76eaad511 100644 --- a/apps/users/templates/users/login.html +++ b/apps/users/templates/users/login.html @@ -60,12 +60,16 @@ + {% if demo_mode %} +

    + Demo账号: admin 密码: admin +

    + {% endif %} + {% trans 'Forgot password' %}? -

    -

    diff --git a/apps/users/views/login.py b/apps/users/views/login.py index 10ad697ba..671bdf8ce 100644 --- a/apps/users/views/login.py +++ b/apps/users/views/login.py @@ -1,6 +1,7 @@ # ~*~ coding: utf-8 ~*~ from __future__ import unicode_literals +import os from django import forms from django.shortcuts import render from django.contrib.auth import login as auth_login, logout as auth_logout @@ -75,6 +76,13 @@ class UserLoginView(FormView): self.redirect_field_name, self.request.GET.get(self.redirect_field_name, reverse('index'))) + def get_context_data(self, **kwargs): + context = { + 'demo_mode': os.environ.get("DEMO_MODE"), + } + kwargs.update(context) + return super().get_context_data(**kwargs) + @method_decorator(never_cache, name='dispatch') class UserLogoutView(TemplateView): @@ -237,7 +245,7 @@ class LoginLogListView(DatetimeSearchMixin, ListView): if self.user: queryset = queryset.filter(username=self.user) if self.keyword: - queryset = self.queryset.filter( + queryset = queryset.filter( Q(ip__contains=self.keyword) | Q(city__contains=self.keyword) | Q(username__contains=self.keyword)