github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1154 from BaiJiangJie/master 

终端管理用户显示，资产导入IP字段空格，资产导入domain字段保存
pull/1181/merge 1.1.0
老广 2018-04-02 19:03:51 +08:00 committed by GitHub
parent 0ca14463cd c48beb10af
commit d2f108eeec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/assets/views/asset.py
View File

@ -28,7 +28,7 @@ from common.mixins import JSONResponseMixin
from common.utils import get_object_or_none, get_logger, is_uuid from common.utils import get_object_or_none, get_logger, is_uuid
from common.const import create_success_msg, update_success_msg from common.const import create_success_msg, update_success_msg
from .. import forms from .. import forms
from ..models import Asset, AdminUser, SystemUser, Label, Node from ..models import Asset, AdminUser, SystemUser, Label, Node, Domain
from ..hands import AdminUserRequiredMixin from ..hands import AdminUserRequiredMixin
@ -279,6 +279,7 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
asset_dict = dict(zip(attr, row)) asset_dict = dict(zip(attr, row))
id_ = asset_dict.pop('id', 0) id_ = asset_dict.pop('id', 0)
for k, v in asset_dict.items(): for k, v in asset_dict.items():
v = v.strip()
if k == 'is_active': if k == 'is_active':
v = True if v in ['TRUE', 1, 'true'] else False v = True if v in ['TRUE', 1, 'true'] else False
elif k == 'admin_user': elif k == 'admin_user':
@ -288,8 +289,8 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
v = int(v) v = int(v)
except ValueError: except ValueError:
v = 0 v = 0
else: elif k == 'domain':
continue v = get_object_or_none(Domain, name=v)
asset_dict[k] = v asset_dict[k] = v
asset = get_object_or_none(Asset, id=id_) if is_uuid(id_) else None asset = get_object_or_none(Asset, id=id_) if is_uuid(id_) else None

2
apps/users/views/group.py
View File

@ -74,7 +74,7 @@ class UserGroupDetailView(AdminUserRequiredMixin, DetailView):
template_name = 'users/user_group_detail.html' template_name = 'users/user_group_detail.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
users = User.objects.exclude(id__in=self.object.users.all()) users = User.objects.exclude(id__in=self.object.users.all()).exclude(role=User.ROLE_APP)
context = { context = {
'app': _('Users'), 'app': _('Users'),
'action': _('User group detail'), 'action': _('User group detail'),