Moved where active status is displayed.
Cleaned up logout redirects Added suburbs admin page back. Wasn't able to create new suburbs Made active status check to any traveller save function
This commit is contained in:
@@ -1,14 +1,12 @@
|
||||
import csv
|
||||
from datetime import date
|
||||
|
||||
from django.contrib.admin import DateFieldListFilter, BooleanFieldListFilter
|
||||
from django.forms import widgets
|
||||
from django.contrib import admin
|
||||
from django.http import HttpResponse
|
||||
from django.urls import reverse
|
||||
from django.utils.html import format_html
|
||||
from django.utils.http import urlencode
|
||||
from django.utils.translation import gettext_lazy
|
||||
from import_export.admin import ImportExportModelAdmin
|
||||
from rangefilter.filters import DateRangeFilterBuilder
|
||||
|
||||
@@ -159,7 +157,7 @@ class BusStopAdmin(MyImportExportModelAdmin, admin.ModelAdmin):
|
||||
search_fields = ["bus__route_name", "address"]
|
||||
|
||||
|
||||
# @admin.register(Suburb)
|
||||
@admin.register(Suburb)
|
||||
class SuburbsAdmin(MyImportExportModelAdmin, admin.ModelAdmin):
|
||||
list_filter = ["state"]
|
||||
|
||||
@@ -171,7 +169,7 @@ class TravellerRouteInline(admin.TabularInline):
|
||||
|
||||
@admin.register(Traveller)
|
||||
class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin, TravellerRollMixin):
|
||||
list_display = ["first_name", "last_name", "school", "year_level", "residential_address", "residential_suburb", "stop_route", "shuttle", "travel_start_date", "travel_end_date"]
|
||||
list_display = ["first_name", "last_name", "school", "year_level", "is_active", "residential_address", "residential_suburb", "stop_route", "shuttle", "travel_start_date", "travel_end_date"]
|
||||
list_filter = [
|
||||
"is_active", "school", "year_level", "eligibility_status", "bus_stops__bus", "shuttle", "residential_suburb",
|
||||
("travel_start_date", DateRangeFilterBuilder(
|
||||
@@ -195,6 +193,7 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
|
||||
fieldsets = [
|
||||
(None, {
|
||||
'fields': [
|
||||
"is_active",
|
||||
"school",
|
||||
"first_name",
|
||||
"last_name",
|
||||
@@ -229,7 +228,6 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
|
||||
"seat_number",
|
||||
"created_on",
|
||||
"last_edit",
|
||||
"is_active",
|
||||
]
|
||||
}),
|
||||
('Adult Contacts', {
|
||||
|
||||
Reference in New Issue
Block a user