NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-26 01:06:11 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

12589 UI fixes

Browse Source
This commit is contained in:
Arthur 2023-06-12 12:41:18 -07:00
parent 057fbf0ac4
commit 78ef1d1412
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/templates/users/base.html
View File

@ -1,4 +1,9 @@
{% extends 'base/layout.html' %} {% extends 'generic/object.html' %}
{% load buttons %}
{% load static %}
{% load helpers %}
{% load plugins %}
{% block tabs %} {% block tabs %}
<ul class="nav nav-tabs px-3"> <ul class="nav nav-tabs px-3">

2
netbox/users/filtersets.py
View File

@ -50,7 +50,7 @@ class UserFilterSet(BaseFilterSet):
class Meta: class Meta:
model = get_user_model() model = get_user_model()
fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'is_active'] fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'is_active', 'is_superuser']
def search(self, queryset, name, value): def search(self, queryset, name, value):
if not value.strip(): if not value.strip():

3
netbox/users/forms/model_forms.py
View File

@ -198,6 +198,7 @@ class GroupForm(BootstrapMixin, forms.ModelForm):
class ObjectPermissionForm(BootstrapMixin, forms.ModelForm): class ObjectPermissionForm(BootstrapMixin, forms.ModelForm):
actions = forms.CharField(required=False)
users = DynamicModelMultipleChoiceField( users = DynamicModelMultipleChoiceField(
required=False, required=False,
queryset=get_user_model().objects.all() queryset=get_user_model().objects.all()
@ -219,7 +220,7 @@ class ObjectPermissionForm(BootstrapMixin, forms.ModelForm):
fieldsets = ( fieldsets = (
(None, ('name', 'description', 'enabled',)), (None, ('name', 'description', 'enabled',)),
('Actions', ('can_view', 'can_add', 'can_change', 'can_delete', 'actions')), ('Actions', ('can_view', 'can_add', 'can_change', 'can_delete', 'actions')),
('Objects', ('object_types')), ('Objects', ('object_types', )),
('Assignment', ('groups', 'users')), ('Assignment', ('groups', 'users')),
('Constraints', ('constraints',)) ('Constraints', ('constraints',))
) )