From 49bee0c3fd76c1bbcf3651f3da0fda443afc7d49 Mon Sep 17 00:00:00 2001
From: root <root@halcyon01.(none)>
Date: Thu, 14 May 2015 18:02:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E6=9C=BA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=88=96=E8=80=85=E4=BF=AE=E6=94=B9=E6=B2=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=9BALL=E7=BB=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store        | Bin 0 -> 6148 bytes
 jasset/views.py  |   4 ++++
 jumpserver.conf  |   2 +-
 static/.DS_Store | Bin 0 -> 6148 bytes
 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 .DS_Store
 create mode 100644 static/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..228971d07180d06cd79ed2aa5688f4d23b0bfcb3
GIT binary patch
literal 6148
zcmeHK&1%~~5S~rkL~$-ENlGA>y#{=614YeEanfVKppsCM;!2gMHz<;kWSd|Ny0(we
zzw|Xq^AdfMUOTh9DRG@#gDEp&=9}HwSxKLyT@3(;&M<xo-~xbyO4w+kxkD&UIwwoE
zr-3N+93>=Bz)0J<;oQLtFarz50DZenIENuzzyNN2ztOlHL}?yj{C6}+Rav#$zr@mV
z<I&2hv({Xv!+qR*6ZG?OP=(d7?1aUsZmBqltltf*{*C`C&(ptt7#*u*+;cY%^Q;P0
zmK3*A&rVbp=i^R3%;NGaF!P<Lxa#-Zt!|NwFtr<I$+0R`q*7H~I%{<F+$WRCp10qU
z?P*I+yytr@>3QCC>V9yXo!w^#FJBL)A3uHm^7Y%*_a8saqY$`sY1y!N1J~%>NzEuI
zvNX@$W1MnVkhTg!R0Z#tHll5Yl7HyJFv~(PU|)P^eIc%fFM=6h1{R3{S|21Tp>MG^
zsFw~jx&%O^-v}+}Q!PO`(xPv%Hi!`vVNwxIs<0)7FzMJY?Kt0JZP28Hu*HY4XBM_X
z5&G;nztqD)_y*ZB1I)lI1IwoA(*FPA{`!A5iCfG7Gw@$AAR0%(Q3r3y?yYk-M|-VA
seTzy$<7$IC1&!T~wL@F+HmVkkNpcW<i?u=QLE#?(O#>Td;6WMq1LBIkxBvhE

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1f949c21808d87add5ebb949967a44aac6745b10
GIT binary patch
literal 6148
zcmeHKUrXaa5Z|r6Gu4+IcZ%T4z6yQl2}iuQ81+#oL@J`vOGvn`grqd7<tT-`>c{Z^
z*AV>@eiC1u+1(bUcW;MCnF+JM+1Z(0_Ls1eWsGsJAAM)cW{g>&h?N>Ne-Ru<osx?2
zAaa}|OtKK{=dhc|sc3S1L<aEPRoDs3!$IDC{r>Wz(RkvOx$39S^HyzP5g+@@!m;1U
z27VC~{oD(BhpH!|I5c)MC^}<%FUyjN9fU0z58C#(tt>49nZ~_WsYm-Vjk1B4_0uRn
z^7VZCGAcT4d#TxrPa(A#q;X5;GL(rd{#Z49+V=8rxbFO{i^ixfhR()%T{w<28rf%-
zwYv6WbN8S-I={HQy1u!+yMNI9bNE!1d^I?RM=%r>r+zO@vh+9f$FbuWLSldzAO>cF
z0du%ni!-qs+5|B`4E#?9@O%)Uh_1m>qdGdE!QV$5uOgy=jduw|VbC>LYJ?FGu2TVZ
zDmPaQuG7IUOq^@5)Tq-LS1ZFjW@T<}C|s=$exbq{cQsN=3=jiv8JN>u8|(khzwiHV
zlc+}w5Cb#C0IzQQ+a7Gm)YhrZVXYOQzd%tiuGBb50YjByh{aO80;&Z30u4adV5t#2
QAoL@kXrP7|cvl8q08m3=$N&HU

literal 0
HcmV?d00001