diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 000000000..228971d07 Binary files /dev/null and b/.DS_Store differ diff --git a/jasset/views.py b/jasset/views.py index 1e9fcb9ef..22c72f8e5 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -4,6 +4,8 @@ import ast from django.db.models import Q from django.template import RequestContext +from django.shortcuts import get_object_or_404 + from jperm.models import Perm from jumpserver.api import * @@ -26,6 +28,8 @@ def get_host_groups(groups): if group: group = group[0] ret.append(group) + group_all = get_object_or_404(BisGroup, name='ALL') + ret.append(group_all) return ret diff --git a/jumpserver.conf b/jumpserver.conf index c1e035757..df6f90b8b 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -23,7 +23,7 @@ root_pw = secret234 [websocket] -web_socket_host = 192.168.20.209:3000 +web_socket_host = 192.168.8.66:3000 [mail] diff --git a/static/.DS_Store b/static/.DS_Store new file mode 100644 index 000000000..1f949c218 Binary files /dev/null and b/static/.DS_Store differ