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

Merge pull request #2976 from jumpserver/dev 

[Update] 解决授权资产显示禁用资产的问题 (#2975)
pull/3007/head
BaiJiangJie 2019-07-17 12:11:40 +08:00 committed by GitHub
parent 158e2a9112 3451c2b418
commit 37c10c6cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/serializers/asset.py
View File

@ -112,7 +112,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
protocol = protocols_data[0].split('/') protocol = protocols_data[0].split('/')
validated_data["protocol"] = protocol[0] validated_data["protocol"] = protocol[0]
validated_data["port"] = int(protocol[1]) validated_data["port"] = int(protocol[1])
if validated_data: if protocols_data:
validated_data["protocols"] = ' '.join(protocols_data) validated_data["protocols"] = ' '.join(protocols_data)
def create(self, validated_data): def create(self, validated_data):

2
apps/assets/serializers/base.py
View File

@ -1,7 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from django.utils.translation import ugettext as _
from rest_framework import serializers from rest_framework import serializers
from common.utils import ssh_pubkey_gen, validate_ssh_private_key from common.utils import ssh_pubkey_gen, validate_ssh_private_key

8
apps/assets/templates/assets/asset_create.html
View File

@ -216,6 +216,8 @@ $(document).ready(function () {
var form = $("form"); var form = $("form");
var protocols = {}; var protocols = {};
var data = form.serializeObject(); var data = form.serializeObject();
objectAttrsIsBool(data, ['is_active']);
objectAttrsIsList(data, ['nodes', 'labels']);
$.each(data, function (k, v) { $.each(data, function (k, v) {
if (k.startsWith("form")){ if (k.startsWith("form")){
delete data[k]; delete data[k];
@ -233,12 +235,6 @@ $(document).ready(function () {
return v.name + '/' + v.port return v.name + '/' + v.port
}); });
data["protocols"] = protocols; data["protocols"] = protocols;
if (typeof data.labels === "string") {
data["labels"] = [data["labels"]];
}
if (typeof data["nodes"] == "string") {
data["nodes"] = [data["nodes"]]
}
var props = { var props = {
url: the_url, url: the_url,
data: data, data: data,

6
apps/perms/utils/asset_permission.py
View File

@ -499,7 +499,7 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
if pattern: if pattern:
assets_ids = Asset.objects.filter( assets_ids = Asset.objects.filter(
nodes__key__regex=pattern nodes__key__regex=pattern
).values_list("id", flat=True).distinct() ).valid().values_list("id", flat=True).distinct()
else: else:
assets_ids = [] assets_ids = []
self.tree.add_assets_without_system_users(assets_ids) self.tree.add_assets_without_system_users(assets_ids)
@ -523,8 +523,8 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
assets_ids = defaultdict(lambda: defaultdict(int)) assets_ids = defaultdict(lambda: defaultdict(int))
for perm in self.permissions: for perm in self.permissions:
actions = [perm.actions] actions = [perm.actions]
_assets_ids = [a.id for a in perm.assets.all()] _assets_ids = perm.assets.valid().values_list("id", flat=True)
system_users_ids = [s.id for s in perm.system_users.all()] system_users_ids = perm.system_users.values_list("id", flat=True)
iterable = itertools.product(_assets_ids, system_users_ids, actions) iterable = itertools.product(_assets_ids, system_users_ids, actions)
for asset_id, sys_id, action in iterable: for asset_id, sys_id, action in iterable:
assets_ids[asset_id][sys_id] |= action assets_ids[asset_id][sys_id] |= action