diff --git a/apps/assets/api/admin_user.py b/apps/assets/api/admin_user.py
index f2229022f..e84d9731a 100644
--- a/apps/assets/api/admin_user.py
+++ b/apps/assets/api/admin_user.py
@@ -20,7 +20,7 @@ from rest_framework.response import Response
from rest_framework_bulk import BulkModelViewSet
from rest_framework.pagination import LimitOffsetPagination
-from common.mixins import IDInFilterMixin
+from common.mixins import IDInCacheFilterMixin
from common.utils import get_logger
from ..hands import IsOrgAdmin
from ..models import AdminUser, Asset
@@ -36,7 +36,7 @@ __all__ = [
]
-class AdminUserViewSet(IDInFilterMixin, BulkModelViewSet):
+class AdminUserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
"""
Admin user api set, for add,delete,update,list,retrieve resource
"""
diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py
index a734806fb..9e21c81be 100644
--- a/apps/assets/api/asset.py
+++ b/apps/assets/api/asset.py
@@ -16,8 +16,9 @@ from django.urls import reverse_lazy
from django.core.cache import cache
from django.db.models import Q
-from common.mixins import IDInFilterMixin
-from common.utils import get_logger
+from common.mixins import IDInCacheFilterMixin
+
+from common.utils import get_logger, get_object_or_none
from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
from ..const import CACHE_KEY_ASSET_BULK_UPDATE_ID_PREFIX
from ..models import Asset, AdminUser, Node
@@ -35,7 +36,7 @@ __all__ = [
]
-class AssetViewSet(IDInFilterMixin, LabelFilter, BulkModelViewSet):
+class AssetViewSet(IDInCacheFilterMixin, LabelFilter, BulkModelViewSet):
"""
API endpoint that allows Asset to be viewed or edited.
"""
@@ -47,6 +48,19 @@ class AssetViewSet(IDInFilterMixin, LabelFilter, BulkModelViewSet):
pagination_class = LimitOffsetPagination
permission_classes = (IsOrgAdminOrAppUser,)
+ def set_assets_node(self, assets):
+ if not isinstance(assets, list):
+ assets = [assets]
+ node = Node.objects.get(value='Default')
+ node_id = self.request.query_params.get('node_id')
+ if node_id:
+ node = get_object_or_none(Node, pk=node_id)
+ node.assets.add(*assets)
+
+ def perform_create(self, serializer):
+ assets = serializer.save()
+ self.set_assets_node(assets)
+
def filter_node(self, queryset):
node_id = self.request.query_params.get("node_id")
if not node_id:
@@ -89,7 +103,7 @@ class AssetViewSet(IDInFilterMixin, LabelFilter, BulkModelViewSet):
return queryset
-class AssetListUpdateApi(IDInFilterMixin, ListBulkCreateUpdateDestroyAPIView):
+class AssetListUpdateApi(IDInCacheFilterMixin, ListBulkCreateUpdateDestroyAPIView):
"""
Asset bulk update api
"""
diff --git a/apps/assets/api/system_user.py b/apps/assets/api/system_user.py
index 9805872e7..f6398e974 100644
--- a/apps/assets/api/system_user.py
+++ b/apps/assets/api/system_user.py
@@ -21,6 +21,7 @@ from rest_framework.pagination import LimitOffsetPagination
from common.utils import get_logger
from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
+from common.mixins import IDInCacheFilterMixin
from ..models import SystemUser, Asset
from .. import serializers
from ..tasks import push_system_user_to_assets_manual, \
@@ -38,7 +39,7 @@ __all__ = [
]
-class SystemUserViewSet(BulkModelViewSet):
+class SystemUserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
"""
System user api set, for add,delete,update,list,retrieve resource
"""
diff --git a/apps/assets/serializers/admin_user.py b/apps/assets/serializers/admin_user.py
index e44679995..66f25db87 100644
--- a/apps/assets/serializers/admin_user.py
+++ b/apps/assets/serializers/admin_user.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
#
from django.core.cache import cache
+from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers
from common.serializers import AdaptedBulkListSerializer
@@ -15,14 +16,29 @@ class AdminUserSerializer(serializers.ModelSerializer):
"""
管理用户
"""
- assets_amount = serializers.SerializerMethodField()
- unreachable_amount = serializers.SerializerMethodField()
- reachable_amount = serializers.SerializerMethodField()
+ password = serializers.CharField(
+ required=False, write_only=True, label=_('Password')
+ )
+ unreachable_amount = serializers.SerializerMethodField(label=_('Unreachable'))
+ assets_amount = serializers.SerializerMethodField(label=_('Asset'))
+ reachable_amount = serializers.SerializerMethodField(label=_('Reachable'))
class Meta:
list_serializer_class = AdaptedBulkListSerializer
model = AdminUser
- fields = '__all__'
+ fields = [
+ 'id', 'org_id', 'name', 'username', 'assets_amount',
+ 'reachable_amount', 'unreachable_amount', 'password', 'comment',
+ 'date_created', 'date_updated', 'become', 'become_method',
+ 'become_user', 'created_by',
+ ]
+
+ extra_kwargs = {
+ 'date_created': {'label': _('Date created')},
+ 'date_updated': {'label': _('Date updated')},
+ 'become': {'read_only': True}, 'become_method': {'read_only': True},
+ 'become_user': {'read_only': True}, 'created_by': {'read_only': True}
+ }
def get_field_names(self, declared_fields, info):
fields = super().get_field_names(declared_fields, info)
diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py
index c0f435adc..3e1cf39bb 100644
--- a/apps/assets/serializers/asset.py
+++ b/apps/assets/serializers/asset.py
@@ -2,6 +2,9 @@
#
from rest_framework import serializers
+from django.utils.translation import ugettext_lazy as _
+
+from orgs.mixins import OrgResourceSerializerMixin
from common.mixins import BulkSerializerMixin
from common.serializers import AdaptedBulkListSerializer
from ..models import Asset
@@ -13,15 +16,35 @@ __all__ = [
]
-class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer):
+class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer, OrgResourceSerializerMixin):
"""
资产的数据结构
"""
class Meta:
model = Asset
list_serializer_class = AdaptedBulkListSerializer
- fields = '__all__'
- validators = []
+ # validators = [] # 解决批量导入时unique_together字段校验失败
+ fields = [
+ 'id', 'org_id', 'org_name', 'ip', 'hostname', 'protocol', 'port',
+ 'platform', 'is_active', 'public_ip', 'domain', 'admin_user',
+ 'nodes', 'labels', 'number', 'vendor', 'model', 'sn',
+ 'cpu_model', 'cpu_count', 'cpu_cores', 'cpu_vcpus', 'memory',
+ 'disk_total', 'disk_info', 'os', 'os_version', 'os_arch',
+ 'hostname_raw', 'comment', 'created_by', 'date_created',
+ 'hardware_info', 'connectivity'
+ ]
+ read_only_fields = (
+ 'number', 'vendor', 'model', 'sn', 'cpu_model', 'cpu_count',
+ 'cpu_cores', 'cpu_vcpus', 'memory', 'disk_total', 'disk_info',
+ 'os', 'os_version', 'os_arch', 'hostname_raw',
+ 'created_by', 'date_created',
+ )
+ extra_kwargs = {
+ 'hardware_info': {'label': _('Hardware info')},
+ 'connectivity': {'label': _('Connectivity')},
+ 'org_name': {'label': _('Org name')}
+
+ }
@classmethod
def setup_eager_loading(cls, queryset):
diff --git a/apps/assets/serializers/system_user.py b/apps/assets/serializers/system_user.py
index c737f8cbe..88ae6eb38 100644
--- a/apps/assets/serializers/system_user.py
+++ b/apps/assets/serializers/system_user.py
@@ -1,5 +1,7 @@
from rest_framework import serializers
+from django.utils.translation import ugettext_lazy as _
+
from common.serializers import AdaptedBulkListSerializer
from ..models import SystemUser, Asset
@@ -10,16 +12,36 @@ class SystemUserSerializer(serializers.ModelSerializer):
"""
系统用户
"""
- unreachable_amount = serializers.SerializerMethodField()
- reachable_amount = serializers.SerializerMethodField()
- unreachable_assets = serializers.SerializerMethodField()
- reachable_assets = serializers.SerializerMethodField()
- assets_amount = serializers.SerializerMethodField()
+ password = serializers.CharField(
+ required=False, write_only=True, label=_('Password')
+ )
+ unreachable_amount = serializers.SerializerMethodField(
+ label=_('Unreachable')
+ )
+ unreachable_assets = serializers.SerializerMethodField(
+ label=_('Unreachable assets')
+ )
+ reachable_assets = serializers.SerializerMethodField(
+ label=_('Reachable assets')
+ )
+ reachable_amount = serializers.SerializerMethodField(label=_('Reachable'))
+ assets_amount = serializers.SerializerMethodField(label=_('Asset'))
class Meta:
model = SystemUser
- exclude = ('_password', '_private_key', '_public_key')
list_serializer_class = AdaptedBulkListSerializer
+ fields = [
+ 'id', 'org_id', 'name', 'username', 'login_mode',
+ 'login_mode_display', 'priority', 'protocol', 'auto_push',
+ 'password', 'assets_amount', 'reachable_amount', 'reachable_assets',
+ 'unreachable_amount', 'unreachable_assets', 'cmd_filters', 'sudo',
+ 'shell', 'comment', 'nodes', 'assets'
+ ]
+ extra_kwargs = {
+ 'login_mode_display': {'label': _('Login mode display')},
+ 'created_by': {'read_only': True}, 'nodes': {'read_only': True},
+ 'assets': {'read_only': True}
+ }
def get_field_names(self, declared_fields, info):
fields = super(SystemUserSerializer, self).get_field_names(declared_fields, info)
diff --git a/apps/assets/templates/assets/_admin_user_import_modal.html b/apps/assets/templates/assets/_admin_user_import_modal.html
new file mode 100644
index 000000000..a4afc1a14
--- /dev/null
+++ b/apps/assets/templates/assets/_admin_user_import_modal.html
@@ -0,0 +1,6 @@
+{% extends '_import_modal.html' %}
+{% load i18n %}
+
+{% block modal_title%}{% trans "Import admin user" %}{% endblock %}
+
+{% block import_modal_download_template_url %}{% url "api-assets:admin-user-list" %}{% endblock %}
diff --git a/apps/assets/templates/assets/_admin_user_update_modal.html b/apps/assets/templates/assets/_admin_user_update_modal.html
new file mode 100644
index 000000000..9af051dd2
--- /dev/null
+++ b/apps/assets/templates/assets/_admin_user_update_modal.html
@@ -0,0 +1,4 @@
+{% extends '_update_modal.html' %}
+{% load i18n %}
+
+{% block modal_title%}{% trans "Update admin user" %}{% endblock %}
\ No newline at end of file
diff --git a/apps/assets/templates/assets/_asset_import_modal.html b/apps/assets/templates/assets/_asset_import_modal.html
index ca7729e05..2460cb053 100644
--- a/apps/assets/templates/assets/_asset_import_modal.html
+++ b/apps/assets/templates/assets/_asset_import_modal.html
@@ -1,29 +1,6 @@
-{% extends '_modal.html' %}
+{% extends '_import_modal.html' %}
{% load i18n %}
-{% block modal_id %}asset_import_modal{% endblock %}
-{% block modal_title%}{% trans "Import asset" %}{% endblock %}
-{% block modal_body %}
-
-
-
-
-
-
-
-
-
-{% endblock %}
-{% block modal_confirm_id %}btn_asset_import{% endblock %}
+
+{% block modal_title%}{% trans "Import assets" %}{% endblock %}
+
+{% block import_modal_download_template_url %}{% url "api-assets:asset-list" %}{% endblock %}
diff --git a/apps/assets/templates/assets/_asset_update_modal.html b/apps/assets/templates/assets/_asset_update_modal.html
new file mode 100644
index 000000000..68b2ff8db
--- /dev/null
+++ b/apps/assets/templates/assets/_asset_update_modal.html
@@ -0,0 +1,4 @@
+{% extends '_update_modal.html' %}
+{% load i18n %}
+
+{% block modal_title%}{% trans "Update assets" %}{% endblock %}
diff --git a/apps/assets/templates/assets/_system_user_import_modal.html b/apps/assets/templates/assets/_system_user_import_modal.html
new file mode 100644
index 000000000..b8687d696
--- /dev/null
+++ b/apps/assets/templates/assets/_system_user_import_modal.html
@@ -0,0 +1,6 @@
+{% extends '_import_modal.html' %}
+{% load i18n %}
+
+{% block modal_title%}{% trans "Import system user" %}{% endblock %}
+
+{% block import_modal_download_template_url %}{% url "api-assets:system-user-list" %}{% endblock %}
diff --git a/apps/assets/templates/assets/_system_user_update_modal.html b/apps/assets/templates/assets/_system_user_update_modal.html
new file mode 100644
index 000000000..9e2920e6a
--- /dev/null
+++ b/apps/assets/templates/assets/_system_user_update_modal.html
@@ -0,0 +1,4 @@
+{% extends '_update_modal.html' %}
+{% load i18n %}
+
+{% block modal_title%}{% trans "Update system user" %}{% endblock %}
\ No newline at end of file
diff --git a/apps/assets/templates/assets/admin_user_list.html b/apps/assets/templates/assets/admin_user_list.html
index 605e89060..c182ba4c4 100644
--- a/apps/assets/templates/assets/admin_user_list.html
+++ b/apps/assets/templates/assets/admin_user_list.html
@@ -1,8 +1,5 @@
{% extends '_base_list.html' %}
{% load i18n static %}
-{% block table_search %}
-{% endblock %}
-
{% block help_message %}
{# 管理用户是资产（被控服务器）上的root，或拥有 NOPASSWD: ALL sudo权限的用户，Jumpserver使用该用户来 `推送系统用户`、`获取资产硬件信息`等。#}
@@ -12,6 +9,30 @@
{% trans 'You can set any one for Windows or other hardware.' %}
{% endblock %}
+{% block table_search %}
+
+{% endblock %}
{% block table_container %}
@@ -36,6 +57,8 @@
+ {% include 'assets/_admin_user_import_modal.html' %}
+ {% include 'assets/_admin_user_update_modal.html' %}
{% endblock %}
{% block content_bottom_left %}{% endblock %}
{% block custom_foot_js %}
@@ -107,6 +130,82 @@ $(document).ready(function(){
$data_table.ajax.reload();
}, 3000);
-});
+})
+.on('click', '.btn_export', function(){
+ var data_table = $('#admin_user_list_table').DataTable();
+ var rows = data_table.rows('.selected').data();
+ var admin_users = [];
+ $.each(rows, function (index, obj) {
+ admin_users.push(obj.id)
+ });
+ var data = {
+ 'resources': admin_users
+ };
+ var search = $("input[type='search']").val();
+ var props = {
+ method: "POST",
+ body: JSON.stringify(data),
+ success_url: "{% url 'api-assets:admin-user-list' %}",
+ format: "csv",
+ params: {
+ search: search
+ }
+ };
+ APIExportData(props);
+}).on('click', '#btn_import_confirm',function () {
+ var url = "{% url 'api-assets:admin-user-list' %}";
+ var file = document.getElementById('id_file').files[0];
+ if(!file){
+ toastr.error("{% trans "Please select file" %}");
+ return
+ }
+ var data_table = $('#admin_user_list_table').DataTable();
+ APIImportData({
+ url: url,
+ method: "POST",
+ body: file,
+ data_table: data_table
+ });
+})
+.on('click', '#download_update_template', function () {
+ var $data_table = $('#admin_user_list_table').DataTable();
+ var rows = $data_table.rows('.selected').data();
+
+ var admin_users = [];
+ $.each(rows, function (index, obj) {
+ admin_users.push(obj.id)
+ });
+
+ var data = {
+ 'resources': admin_users
+ };
+ var search = $("input[type='search']").val();
+ var props = {
+ method: "POST",
+ body: JSON.stringify(data),
+ success_url: "{% url 'api-assets:admin-user-list' %}?format=csv&template=update",
+ format: 'csv',
+ params: {
+ search: search
+ }
+ };
+ APIExportData(props);
+})
+.on('click', '#btn_update_confirm', function () {
+ var file = document.getElementById('update_file').files[0];
+ if(!file){
+ toastr.error("{% trans "Please select file" %}");
+ return
+ }
+ var url = "{% url 'api-assets:admin-user-list' %}";
+ var data_table = $('#admin_user_list_table').DataTable();
+
+ APIImportData({
+ url: url,
+ method: "PUT",
+ body: file,
+ data_table: data_table
+ });
+})
{% endblock %}
diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index aa27de7a8..ea74e25d1 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -67,14 +67,26 @@
{% include "users/_user_import_modal.html" %}
+{% include "users/_user_update_modal.html" %}
{% endblock %}
{% block content_bottom_left %}{% endblock %}
{% block custom_foot_js %}
@@ -113,6 +126,7 @@ function initTable() {
return table
}
+
$(document).ready(function(){
var table = initTable();
var fields = $('#fm_user_bulk_update .form-group');
@@ -120,87 +134,127 @@ $(document).ready(function(){
console.log(value)
});
$('.btn_export').click(function () {
- var users = [];
var rows = table.rows('.selected').data();
- if(rows.length===0){
- rows = table.rows().data();
- }
+ var users = [];
$.each(rows, function (index, obj) {
users.push(obj.id)
});
- $.ajax({
- url: "{% url 'users:user-export' %}",
- method: 'POST',
- data: JSON.stringify({users_id: users}),
- dataType: "json",
- success: function (data, textStatus) {
- window.open(data.redirect)
- },
- error: function () {
- toastr.error('Export failed');
+ var data = {
+ 'resources': users
+ };
+ var search = $("input[type='search']").val();
+ var props = {
+ method: "POST",
+ body: JSON.stringify(data),
+ success_url: "{% url 'api-users:user-list' %}",
+ format: 'csv',
+ params: {
+ search: search
}
- })
+ };
+ APIExportData(props);
});
- $('#btn_user_import').click(function() {
- var $form = $('#fm_user_import');
- $form.find('.help-block').remove();
- function success (data) {
- if (data.valid === false) {
- $('', {class: 'help-block text-danger'}).html(data.msg).insertAfter($('#id_users'));
- } else {
- $('#id_created').html(data.created_info);
- $('#id_created_detail').html(data.created.join(', '));
- $('#id_updated').html(data.updated_info);
- $('#id_updated_detail').html(data.updated.join(', '));
- $('#id_failed').html(data.failed_info);
- $('#id_failed_detail').html(data.failed.join(', '));
- var $data_table = $('#user_list_table').DataTable();
- $data_table.ajax.reload();
- }
+ $('#btn_import_confirm').click(function() {
+ var url = "{% url 'api-users:user-list' %}";
+ var file = document.getElementById('id_file').files[0];
+ if(!file){
+ toastr.error("{% trans "Please select file" %}");
+ return
}
- $form.ajaxSubmit({success: success});
- })
+ var data_table = $('#user_list_table').DataTable();
+ APIImportData({
+ url: url,
+ method: "POST",
+ body: file,
+ data_table: data_table
+ });
+ });
+ $('#download_update_template').click(function () {
+ var rows = table.rows('.selected').data();
+ var users = [];
+ $.each(rows, function (index, obj) {
+ users.push(obj.id)
+ });
+ var data = {
+ 'resources': users
+ };
+ var search = $("input[type='search']").val();
+ var props = {
+ method: "POST",
+ body: JSON.stringify(data),
+ success_url: "{% url 'api-users:user-list' %}?format=csv&template=update",
+ format: 'csv',
+ params: {
+ search: search
+ }
+ };
+ APIExportData(props);
+ });
+ $('#btn_update_confirm').click(function() {
+ var url = "{% url 'api-users:user-list' %}";
+ var file = document.getElementById('update_file').files[0];
+ if(!file){
+ toastr.error("{% trans "Please select file" %}");
+ return
+ }
+ var data_table = $('#user_list_table').DataTable();
+ APIImportData({
+ url: url,
+ method: "PUT",
+ body: file,
+ data_table: data_table
+ });
+ });
}).on('click', '#btn_bulk_update', function(){
var action = $('#slct_bulk_update').val();
var $data_table = $('#user_list_table').DataTable();
var id_list = [];
- var plain_id_list = [];
$data_table.rows({selected: true}).every(function(){
- id_list.push({pk: this.data().id});
- plain_id_list.push(this.data().id);
+ id_list.push(this.data().id);
});
- if (id_list === []) {
+ if (id_list.length === 0) {
return false;
}
var the_url = "{% url 'api-users:user-list' %}";
+ var data = {
+ 'resources': id_list
+ };
+ function refreshTag() {
+ $('#user_list_table').DataTable().ajax.reload()
+ }
function doDeactive() {
- var body = $.each(id_list, function(index, user_object) {
- user_object['is_active'] = false;
+ var data = [];
+ $.each(id_list, function(index, object_id) {
+ var obj = {"pk": object_id, "is_active": false};
+ data.push(obj);
});
function success() {
- location.reload();
+ setTimeout( function () {
+ window.location.reload();}, 300);
}
APIUpdateAttr({
url: the_url,
method: 'PATCH',
- body: JSON.stringify(body),
+ body: JSON.stringify(data),
success: success
});
- location.reload();
}
- function doActive() {
- var body = $.each(id_list, function(index, user_object) {
- user_object['is_active'] = true;
+ function doActive() {
+ var data = [];
+ $.each(id_list, function(index, object_id) {
+ var obj = {"pk": object_id, "is_active": true};
+ data.push(obj);
});
function success() {
- location.reload();
+ setTimeout( function () {
+ window.location.reload();}, 300);
}
APIUpdateAttr({
url: the_url,
method: 'PATCH',
- body: JSON.stringify(body),
+ body: JSON.stringify(data),
success: success
});
}
@@ -214,26 +268,49 @@ $(document).ready(function(){
confirmButtonColor: "#DD6B55",
confirmButtonText: "{% trans 'Confirm' %}",
closeOnConfirm: false
- }, function() {
- var success = function() {
+ },function () {
+ function success(data) {
+ url = setUrlParam(the_url, 'spm', data.spm);
+ APIUpdateAttr({
+ url:url,
+ method:'DELETE',
+ success:refreshTag,
+ flash_message:false,
+ });
var msg = "{% trans 'User Deleted.' %}";
swal("{% trans 'User Delete' %}", msg, "success");
- $('#user_list_table').DataTable().ajax.reload();
- };
- var fail = function() {
+ }
+ function fail() {
var msg = "{% trans 'User Deleting failed.' %}";
swal("{% trans 'User Delete' %}", msg, "error");
- };
- var url_delete = the_url + '?id__in=' + JSON.stringify(plain_id_list);
- APIUpdateAttr({url: url_delete, method: 'DELETE', success: success, error: fail});
- jumpserver.checked = false;
- });
+ }
+ APIUpdateAttr({
+ url: "{% url 'api-common:resources-cache' %}",
+ method:'POST',
+ body:JSON.stringify(data),
+ success:success,
+ error:fail
+ })
+ })
}
+
function doUpdate() {
- var users_id = plain_id_list.join(',');
- var url = "{% url 'users:user-bulk-update' %}?users_id=" + users_id;
- location.href = url
- }
+ function fail(data) {
+ toastr.error(JSON.parse(data))
+ }
+ function success(data) {
+ var url = "{% url 'users:user-bulk-update' %}";
+ location.href= setUrlParam(url, 'spm', data.spm);
+ }
+ APIUpdateAttr({
+ url: "{% url 'api-common:resources-cache' %}",
+ method:'POST',
+ body:JSON.stringify(data),
+ flash_message:false,
+ success:success,
+ error:fail
+ })
+ }
switch(action) {
case 'deactive':
doDeactive();
diff --git a/apps/users/views/user.py b/apps/users/views/user.py
index 270a9a5c9..a7515d030 100644
--- a/apps/users/views/user.py
+++ b/apps/users/views/user.py
@@ -31,7 +31,9 @@ from django.views.generic.detail import DetailView
from django.views.decorators.csrf import csrf_exempt
from django.contrib.auth import logout as auth_logout
-from common.const import create_success_msg, update_success_msg
+from common.const import (
+ create_success_msg, update_success_msg, KEY_CACHE_RESOURCES_ID
+)
from common.mixins import JSONResponseMixin
from common.utils import get_logger, get_object_or_none, is_uuid, ssh_key_gen
from common.permissions import AdminUserRequiredMixin
@@ -156,15 +158,12 @@ class UserBulkUpdateView(AdminUserRequiredMixin, TemplateView):
id_list = None
def get(self, request, *args, **kwargs):
- users_id = self.request.GET.get('users_id', '')
- self.id_list = [i for i in users_id.split(',')]
-
+ spm = request.GET.get('spm', '')
+ users_id = cache.get(KEY_CACHE_RESOURCES_ID.format(spm))
if kwargs.get('form'):
self.form = kwargs['form']
elif users_id:
- self.form = self.form_class(
- initial={'users': self.id_list}
- )
+ self.form = self.form_class(initial={'users': users_id})
else:
self.form = self.form_class()
return super().get(request, *args, **kwargs)