12589 review changes

This commit is contained in:
Arthur 2023-07-13 20:48:06 +07:00
parent 40c8e67c03
commit 2871cb9f40
2 changed files with 17 additions and 13 deletions

View File

@ -31,6 +31,17 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
<div class="card">
<h5 class="card-header">{% trans "Assigned Groups" %}</h5>
<ul class="list-group list-group-flush">
{% for group in object.groups.all %}
<li class="list-group-item">{{ group }}</li>
{% empty %}
<li class="list-group-item text-muted">{% trans "None" %}</li>
{% endfor %}
</ul>
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

View File

@ -1,16 +1,9 @@
from django import forms from django import forms
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from users.models import NetBoxGroup, NetBoxUser, ObjectPermission
from circuits.choices import CircuitCommitRateChoices, CircuitStatusChoices
from circuits.models import *
from dcim.models import Region, Site, SiteGroup
from ipam.models import ASN
from netbox.forms import NetBoxModelFilterSetForm
from tenancy.forms import TenancyFilterForm, ContactModelFilterForm
from users.models import ObjectPermission, NetBoxGroup, NetBoxUser
from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice
from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField
from utilities.forms.widgets import DatePicker, NumberWithOptions from netbox.forms import NetBoxModelFilterSetForm
__all__ = ( __all__ = (
'GroupFilterForm', 'GroupFilterForm',
@ -19,7 +12,7 @@ __all__ = (
) )
class UserFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): class UserFilterForm(NetBoxModelFilterSetForm):
model = NetBoxUser model = NetBoxUser
fieldsets = ( fieldsets = (
(None, ('q', 'filter_id',)), (None, ('q', 'filter_id',)),
@ -48,14 +41,14 @@ class UserFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
) )
class GroupFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): class GroupFilterForm(NetBoxModelFilterSetForm):
model = NetBoxGroup model = NetBoxGroup
fieldsets = ( fieldsets = (
(None, ('q', 'filter_id',)), (None, ('q', 'filter_id',)),
) )
class ObjectPermissionFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): class ObjectPermissionFilterForm(NetBoxModelFilterSetForm):
model = ObjectPermission model = ObjectPermission
fieldsets = ( fieldsets = (
(None, ('q', 'filter_id',)), (None, ('q', 'filter_id',)),