diff --git a/apps/assets/forms.py b/apps/assets/forms.py index 68aaddc43..824ef3fcd 100644 --- a/apps/assets/forms.py +++ b/apps/assets/forms.py @@ -93,7 +93,7 @@ class AssetBulkUpdateForm(forms.ModelForm): model = Asset fields = [ 'assets', 'port', 'groups', "cluster", - 'type', 'env', 'status', + 'type', 'env', ] widgets = { 'groups': forms.SelectMultiple(attrs={'class': 'select2', 'data-placeholder': _('Select asset groups')}), diff --git a/apps/assets/templates/assets/admin_user_assets.html b/apps/assets/templates/assets/admin_user_assets.html index dcaaef312..c00a56e60 100644 --- a/apps/assets/templates/assets/admin_user_assets.html +++ b/apps/assets/templates/assets/admin_user_assets.html @@ -34,7 +34,7 @@
- {% trans 'Asset list of ' %} {{ admin_user.name }} {{ total_amount }} {{ unreachable_amount }} + {% trans 'Asset list of ' %} {{ admin_user.name }}
diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 0a19ba3de..2c562ffa5 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -178,9 +178,15 @@ $(document).ready(function(){ var obj = {"pk": object_id, "is_active": false}; data.push(obj); }); - APIUpdateAttr({url: the_url, method: 'PATCH', body: JSON.stringify(data)}); - $data_table.ajax.reload(); - jumpserver.checked = false; + function success() { + location.reload() + } + APIUpdateAttr({ + url: the_url, + method: 'PATCH', + body: JSON.stringify(data), + success: success + }); } function doActive() { var data = []; @@ -188,9 +194,15 @@ $(document).ready(function(){ var obj = {"pk": object_id, "is_active": true}; data.push(obj); }); - APIUpdateAttr({url: the_url, method: 'PATCH', body: JSON.stringify(data)}); - $data_table.ajax.reload(); - jumpserver.checked = false; + function success() { + location.reload(); + } + APIUpdateAttr({ + url: the_url, + method: 'PATCH', + body: JSON.stringify(data), + success: success + }); } function doDelete() { swal({ diff --git a/apps/assets/templates/assets/cluster_assets.html b/apps/assets/templates/assets/cluster_assets.html index b194a5034..88969a000 100644 --- a/apps/assets/templates/assets/cluster_assets.html +++ b/apps/assets/templates/assets/cluster_assets.html @@ -28,7 +28,7 @@
- {% trans 'Cluster assets' %} {{ cluster.name }} {{ cluster.assets.all.count }} + {% trans 'Cluster assets' %} {{ cluster.name }}
diff --git a/apps/users/forms.py b/apps/users/forms.py index 651df78d3..018c39a18 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -156,7 +156,7 @@ class UserBulkUpdateForm(forms.ModelForm): class Meta: model = User - fields = ['users', 'role', 'groups', 'date_expired', 'is_active'] + fields = ['users', 'role', 'groups', 'date_expired'] widgets = { "groups": forms.SelectMultiple( attrs={ @@ -172,6 +172,7 @@ class UserBulkUpdateForm(forms.ModelForm): if self.data.get(field) is not None: changed_fields.append(field) + print(changed_fields) cleaned_data = {k: v for k, v in self.cleaned_data.items() if k in changed_fields} users = cleaned_data.pop('users', '') @@ -186,7 +187,7 @@ class UserBulkUpdateForm(forms.ModelForm): class UserGroupForm(forms.ModelForm): users = forms.ModelMultipleChoiceField( - queryset=User.objects.all(), + queryset=User.objects.exclude(role=User.ROLE_APP), label=_("User"), widget=forms.SelectMultiple( attrs={ diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html index ab9bcf3c7..24ec5b226 100644 --- a/apps/users/templates/users/user_list.html +++ b/apps/users/templates/users/user_list.html @@ -161,18 +161,30 @@ $(document).ready(function(){ var body = $.each(id_list, function(index, user_object) { user_object['is_active'] = false; }); - console.log(body); - APIUpdateAttr({url: the_url, method: 'PATCH', body: JSON.stringify(body)}); - $data_table.ajax.reload(); - jumpserver.checked = false; + function success() { + location.reload(); + } + APIUpdateAttr({ + url: the_url, + method: 'PATCH', + body: JSON.stringify(body), + success: success + }); + location.reload(); } function doActive() { var body = $.each(id_list, function(index, user_object) { user_object['is_active'] = true; }); - APIUpdateAttr({url: the_url, method: 'PATCH', body: JSON.stringify(body)}); - $data_table.ajax.reload(); - jumpserver.checked = false; + function success() { + location.reload(); + } + APIUpdateAttr({ + url: the_url, + method: 'PATCH', + body: JSON.stringify(body), + success: success + }); } function doDelete() { swal({