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

[Update] 修复bug

pull/1185/head
ibuler 2018-04-10 20:45:01 +08:00
parent 84634eb8c0
commit 33c299566a
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/common/utils.py
View File

@ -358,11 +358,17 @@ def get_short_uuid_str():
return str(uuid.uuid4()).split('-')[-1] return str(uuid.uuid4()).split('-')[-1]
def is_uuid(s): def is_uuid(seq):
if UUID_PATTERN.match(s): if isinstance(seq, str):
return True if UUID_PATTERN.match(seq):
return True
else:
return False
else: else:
return False for s in seq:
if not is_uuid(s):
return False
return True
def get_signer(): def get_signer():
@ -386,3 +392,4 @@ class TeeObj:
def close(self): def close(self):
self.file_obj.close() self.file_obj.close()

8
apps/perms/views.py
View File

@ -8,7 +8,7 @@ from django.views.generic.edit import DeleteView
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.conf import settings from django.conf import settings
from common.utils import get_object_or_none from common.utils import is_uuid
from .hands import AdminUserRequiredMixin, Node, Asset from .hands import AdminUserRequiredMixin, Node, Asset
from .models import AssetPermission from .models import AssetPermission
from .forms import AssetPermissionForm from .forms import AssetPermissionForm
@ -37,13 +37,15 @@ class AssetPermissionCreateView(AdminUserRequiredMixin, CreateView):
def get_form(self, form_class=None): def get_form(self, form_class=None):
form = super().get_form(form_class=form_class) form = super().get_form(form_class=form_class)
nodes_id = self.request.GET.get("nodes").split(",") nodes_id = self.request.GET.get("nodes")
assets_id = self.request.GET.get("assets").split(",") assets_id = self.request.GET.get("assets")
if nodes_id: if nodes_id:
nodes_id = nodes_id.split(",")
nodes = Node.objects.filter(id__in=nodes_id) nodes = Node.objects.filter(id__in=nodes_id)
form['nodes'].initial = nodes form['nodes'].initial = nodes
if assets_id: if assets_id:
assets_id = assets_id.split(",")
assets = Asset.objects.filter(id__in=assets_id) assets = Asset.objects.filter(id__in=assets_id)
form['assets'].initial = assets form['assets'].initial = assets
return form return form