Kaydet (Commit) e744c7e4 authored tarafından Tim Graham's avatar Tim Graham

Imported specific models in a few tests that didn't.

üst 9b79281e
This diff is collapsed.
from django.contrib import admin from django.contrib import admin
from . import models from .models import (
Advisor, Album, Band, Bee, Car, CarTire, Event, Inventory, Member, Profile,
School, User,
)
class WidgetAdmin(admin.AdminSite): class WidgetAdmin(admin.AdminSite):
...@@ -15,7 +18,7 @@ class CarAdmin(admin.ModelAdmin): ...@@ -15,7 +18,7 @@ class CarAdmin(admin.ModelAdmin):
class CarTireAdmin(admin.ModelAdmin): class CarTireAdmin(admin.ModelAdmin):
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == "car": if db_field.name == "car":
kwargs["queryset"] = models.Car.objects.filter(owner=request.user) kwargs["queryset"] = Car.objects.filter(owner=request.user)
return db_field.formfield(**kwargs) return db_field.formfield(**kwargs)
return super(CarTireAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) return super(CarTireAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
...@@ -36,21 +39,21 @@ class SchoolAdmin(admin.ModelAdmin): ...@@ -36,21 +39,21 @@ class SchoolAdmin(admin.ModelAdmin):
site = WidgetAdmin(name='widget-admin') site = WidgetAdmin(name='widget-admin')
site.register(models.User) site.register(User)
site.register(models.Car, CarAdmin) site.register(Car, CarAdmin)
site.register(models.CarTire, CarTireAdmin) site.register(CarTire, CarTireAdmin)
site.register(models.Member) site.register(Member)
site.register(models.Band) site.register(Band)
site.register(models.Event, EventAdmin) site.register(Event, EventAdmin)
site.register(models.Album, AlbumAdmin) site.register(Album, AlbumAdmin)
site.register(models.Inventory) site.register(Inventory)
site.register(models.Bee) site.register(Bee)
site.register(models.Advisor) site.register(Advisor)
site.register(models.School, SchoolAdmin) site.register(School, SchoolAdmin)
site.register(models.Profile) site.register(Profile)
This diff is collapsed.
...@@ -7,7 +7,8 @@ from django.contrib.auth.decorators import login_required ...@@ -7,7 +7,8 @@ from django.contrib.auth.decorators import login_required
from django.views.decorators.cache import cache_page from django.views.decorators.cache import cache_page
from django.views.generic import TemplateView from django.views.generic import TemplateView
from . import models, views from . import views
from .models import Book
urlpatterns = [ urlpatterns = [
# TemplateView # TemplateView
...@@ -134,7 +135,7 @@ urlpatterns = [ ...@@ -134,7 +135,7 @@ urlpatterns = [
url(r'^dates/books/paginated/$', url(r'^dates/books/paginated/$',
views.BookArchive.as_view(paginate_by=10)), views.BookArchive.as_view(paginate_by=10)),
url(r'^dates/books/reverse/$', url(r'^dates/books/reverse/$',
views.BookArchive.as_view(queryset=models.Book.objects.order_by('pubdate'))), views.BookArchive.as_view(queryset=Book.objects.order_by('pubdate'))),
url(r'^dates/books/by_month/$', url(r'^dates/books/by_month/$',
views.BookArchive.as_view(date_list_period='month')), views.BookArchive.as_view(date_list_period='month')),
url(r'^dates/booksignings/$', url(r'^dates/booksignings/$',
...@@ -207,7 +208,7 @@ urlpatterns = [ ...@@ -207,7 +208,7 @@ urlpatterns = [
url(r'^dates/books/no_year/$', url(r'^dates/books/no_year/$',
views.BookYearArchive.as_view()), views.BookYearArchive.as_view()),
url(r'^dates/books/(?P<year>[0-9]{4})/reverse/$', url(r'^dates/books/(?P<year>[0-9]{4})/reverse/$',
views.BookYearArchive.as_view(queryset=models.Book.objects.order_by('pubdate'))), views.BookYearArchive.as_view(queryset=Book.objects.order_by('pubdate'))),
url(r'^dates/booksignings/(?P<year>[0-9]{4})/$', url(r'^dates/booksignings/(?P<year>[0-9]{4})/$',
views.BookSigningYearArchive.as_view()), views.BookSigningYearArchive.as_view()),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment