Commit ddf5360c authored by ibuler's avatar ibuler

Merge branch 'dev' into test

parents 35d8896f deb1d21a
...@@ -201,7 +201,7 @@ class InteractiveServer: ...@@ -201,7 +201,7 @@ class InteractiveServer:
def display_group_assets(self, _id): def display_group_assets(self, _id):
if _id > len(self.asset_groups) or _id <= 0: if _id > len(self.asset_groups) or _id <= 0:
self.client.send(wr(warning("Not match group, select again"))) self.client.send(wr(warning("No matched group, select again")))
self.display_asset_groups() self.display_asset_groups()
return return
......
...@@ -30,5 +30,5 @@ tornado==4.5.2 ...@@ -30,5 +30,5 @@ tornado==4.5.2
urllib3==1.22 urllib3==1.22
wcwidth==0.1.7 wcwidth==0.1.7
werkzeug==0.12.2 werkzeug==0.12.2
jumpserver-python-sdk==0.0.28 jumpserver-python-sdk==0.0.29
jms-es-sdk jms-es-sdk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment