mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Converted secrets object lists to ObjectListView

Browse Source
This commit is contained in:
Jeremy Stretch
2016-03-04 11:33:15 -05:00
parent d7e2acbae6
commit c036db2677
3 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/secrets/urls.py
View File

@ -3,7 +3,7 @@ from django.conf.urls import url
from . import views from . import views
urlpatterns = [ urlpatterns = [
url(r'^secrets/$', views.secret_list, name='secret_list'), url(r'^secrets/$', views.SecretListView.as_view(), name='secret_list'),
url(r'^secrets/import/$', views.secret_import, name='secret_import'), url(r'^secrets/import/$', views.secret_import, name='secret_import'),
url(r'^secrets/edit/$', views.SecretBulkEditView.as_view(), name='secret_bulk_edit'), url(r'^secrets/edit/$', views.SecretBulkEditView.as_view(), name='secret_bulk_edit'),
url(r'^secrets/delete/$', views.SecretBulkDeleteView.as_view(), name='secret_bulk_delete'), url(r'^secrets/delete/$', views.SecretBulkDeleteView.as_view(), name='secret_bulk_delete'),

30
netbox/secrets/views.py
View File

@ -1,5 +1,4 @@
from django.apps import apps from django.apps import apps
from django.conf import settings
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.decorators import permission_required, login_required from django.contrib.auth.decorators import permission_required, login_required
from django.contrib.auth.mixins import PermissionRequiredMixin from django.contrib.auth.mixins import PermissionRequiredMixin
@ -7,12 +6,11 @@ from django.core.urlresolvers import reverse
from django.db import transaction, IntegrityError from django.db import transaction, IntegrityError
from django.db.models import ProtectedError from django.db.models import ProtectedError
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.utils.decorators import method_decorator
from django_tables2 import RequestConfig
from utilities.error_handlers import handle_protectederror from utilities.error_handlers import handle_protectederror
from utilities.forms import ConfirmationForm from utilities.forms import ConfirmationForm
from utilities.paginator import EnhancedPaginator from utilities.views import BulkEditView, BulkDeleteView, ObjectListView
from utilities.views import BulkEditView, BulkDeleteView
from .decorators import userkey_required from .decorators import userkey_required
from .filters import SecretFilter from .filters import SecretFilter
@ -25,23 +23,15 @@ from .tables import SecretTable, SecretBulkEditTable
# Secrets # Secrets
# #
@login_required @method_decorator(login_required, name='dispatch')
def secret_list(request): class SecretListView(ObjectListView):
queryset = Secret.objects.select_related('role').prefetch_related('parent') queryset = Secret.objects.select_related('role').prefetch_related('parent')
queryset = SecretFilter(request.GET, queryset).qs filter = SecretFilter
filter_form = SecretFilterForm
if request.user.has_perm('secrets.change_secret') or request.user.has_perm('secrets.delete_secret'): table = SecretTable
secret_table = SecretBulkEditTable(queryset) edit_table = SecretBulkEditTable
else: edit_table_permissions = ['secrets.change_secret', 'secrets.delete_secret']
secret_table = SecretTable(queryset) template_name = 'secrets/secret_list.html'
RequestConfig(request, paginate={'per_page': settings.PAGINATE_COUNT, 'klass': EnhancedPaginator})\
.configure(secret_table)
return render(request, 'secrets/secret_list.html', {
'secret_table': secret_table,
'filter_form': SecretFilterForm(request.GET, label_suffix=''),
})
@login_required @login_required

2
netbox/templates/secrets/secret_list.html
View File

@ -15,7 +15,7 @@
<h1>Secrets</h1> <h1>Secrets</h1>
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-9">
{% include 'secrets/inc/secret_table.html' with table=secret_table %} {% include 'secrets/inc/secret_table.html' %}
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
{% include 'inc/filter_panel.html' %} {% include 'inc/filter_panel.html' %}