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

Merge pull request #3571 from jumpserver/bugfix 

[Bugfix] 修复vault导出选择id的bug
pull/3575/head
BaiJiangJie 2019-12-27 16:05:28 +08:00 committed by GitHub
parent b4cf540e51 b3114a1f3d
commit a2350e7f1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/assets/backends/base.py
View File

@ -43,7 +43,7 @@ class AssetUserQuerySet(list):
else: else:
in_kwargs[k] = v in_kwargs[k] = v
for k in in_kwargs: for k in in_kwargs:
kwargs.pop(k) kwargs.pop(k, None)
if len(in_kwargs) == 0: if len(in_kwargs) == 0:
return self return self
@ -56,7 +56,7 @@ class AssetUserQuerySet(list):
v = [str(i) for i in v] v = [str(i) for i in v]
if isinstance(attr, uuid.UUID): if isinstance(attr, uuid.UUID):
attr = str(attr) attr = str(attr)
if v in attr: if attr in v:
matched = True matched = True
if matched: if matched:
queryset.append(i) queryset.append(i)
@ -68,11 +68,12 @@ class AssetUserQuerySet(list):
real = [] real = []
for k, v in kwargs.items(): for k, v in kwargs.items():
wanted.append(v) wanted.append(v)
value = getattr(obj, k) value = getattr(obj, k, None)
if isinstance(value, uuid.UUID): if isinstance(value, uuid.UUID):
value = str(value) value = str(value)
real.append(value) real.append(value)
return wanted == real return wanted == real
kwargs = {k: v for k, v in kwargs.items() if k.find('__in') == -1}
if len(kwargs) > 0: if len(kwargs) > 0:
queryset = AssetUserQuerySet([i for i in self if filter_it(i)]) queryset = AssetUserQuerySet([i for i in self if filter_it(i)])
else: else:

4
apps/assets/templates/assets/_asset_update_modal.html
View File

@ -1,4 +0,0 @@
{% extends '_update_modal.html' %}
{% load i18n %}
{% block modal_title%}{% trans "Update assets" %}{% endblock %}

28
apps/templates/_import_modal.html
View File

@ -1,28 +0,0 @@
{% extends '_modal.html' %}
{% load i18n %}
{% block modal_id %}import_modal{% endblock %}
{% block modal_confirm_id %}btn_import_confirm{% endblock %}
{% block modal_body %}
<form method="post" id="fm_import">
{% csrf_token %}
<div class="form-group">
<label class="control-label">{% trans "Download the imported template or use the exported CSV file format" %}</label>
<a href="{% block import_modal_download_template_url %}{% endblock %}?format=csv&template=import&limit=1" style="display: block">{% trans 'Download the import template' %}</a>
</div>
<div class="form-group">
<label class="control-label" for="id_file">{% trans "Select the CSV file to import" %}</label>
<input id="id_file" type="file" name="file" />
</div>
</form>
<div>
<p class="text-success" id="success_created"></p>
<p id="success_created_detail"></p>
<p class="text-danger" id="created_failed"></p>
<p id="created_failed_detail"></p>
</div>
{% endblock %}

28
apps/templates/_update_modal.html
View File

@ -1,28 +0,0 @@
{% extends '_modal.html' %}
{% load i18n %}
{% block modal_id %}update_modal{% endblock %}
{% block modal_confirm_id %}btn_update_confirm{% endblock %}
{% block modal_body %}
<form method="post" id="fm_import">
{% csrf_token %}
<div class="form-group">
<label class="control-label">{% trans "Download the update template or use the exported CSV file format" %}</label>
<a id="download_update_template" style="display: block">{% trans 'Download the update template' %}</a>
</div>
<div class="form-group">
<label class="control-label" for="update_file">{% trans "Select the CSV file to import" %}</label>
<input id="update_file" type="file" name="file" />
</div>
</form>
<div>
<p class="text-warning" id="success_updated"></p>
<p id="success_updated_detail"></p>
<p class="text-danger" id="updated_failed"></p>
<p id="updated_failed_detail"></p>
</div>
{% endblock %}