diff --git a/README.rst b/README.rst index 6cb77a0..d0b4775 100644 --- a/README.rst +++ b/README.rst @@ -58,10 +58,9 @@ Our goal is to make this API work: from django.contrib.auth.models import User import djadmin2 - from djadmin2.admins import ModelAdmin2 - class UserAdmin2(ModelAdmin2): + class UserAdmin2(djadmin2.ModelAdmin2): create_form_class = UserCreationForm update_form_class = UserChangeForm diff --git a/djadmin2/__init__.py b/djadmin2/__init__.py index eba65be..329aa00 100644 --- a/djadmin2/__init__.py +++ b/djadmin2/__init__.py @@ -8,6 +8,9 @@ VERSION = __version__ # synonym ISO_8601 = 'iso-8601' from . import core +from . import types default = core.Admin2() +ModelAdmin2 = types.ModelAdmin2 +Admin2Inline = types.Admin2Inline diff --git a/djadmin2/admins.py b/djadmin2/admins.py deleted file mode 100644 index 39d766b..0000000 --- a/djadmin2/admins.py +++ /dev/null @@ -1,8 +0,0 @@ -""" - This serves as an easy to remember alias for types. -""" - -from . import types - -ModelAdmin2 = types.ModelAdmin2 -Admin2Inline = types.Admin2Inline diff --git a/djadmin2/tests/test_core.py b/djadmin2/tests/test_core.py index 19634ee..6828032 100644 --- a/djadmin2/tests/test_core.py +++ b/djadmin2/tests/test_core.py @@ -2,7 +2,7 @@ from django.db import models from django.core.exceptions import ImproperlyConfigured from django.test import TestCase -from ..admins import ModelAdmin2 +from ..types import ModelAdmin2 from ..core import Admin2 diff --git a/docs/index.rst b/docs/index.rst index 428296b..fdf7722 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -31,10 +31,9 @@ Our goal is to make this API work: from django.contrib.auth.models import User import djadmin2 - from djadmin2.admins import ModelAdmin2 - class UserAdmin2(ModelAdmin2): + class UserAdmin2(djadmin2.ModelAdmin2): create_form_class = UserCreationForm update_form_class = UserChangeForm diff --git a/example/blog/admin2.py b/example/blog/admin2.py index f39f252..c8944b1 100644 --- a/example/blog/admin2.py +++ b/example/blog/admin2.py @@ -7,7 +7,6 @@ from rest_framework.relations import PrimaryKeyRelatedField import djadmin2 from djadmin2.forms import floppify_form -from djadmin2.admins import ModelAdmin2, Admin2Inline from djadmin2.apiviews import Admin2APISerializer @@ -22,7 +21,7 @@ class GroupSerializer(Admin2APISerializer): model = Group -class GroupAdmin2(ModelAdmin2): +class GroupAdmin2(djadmin2.ModelAdmin2): api_serializer_class = GroupSerializer @@ -34,15 +33,15 @@ class UserSerializer(Admin2APISerializer): exclude = ('passwords',) -class CommentInline(Admin2Inline): +class CommentInline(djadmin2.Admin2Inline): model = Comment -class PostAdmin(ModelAdmin2): +class PostAdmin(djadmin2.ModelAdmin2): inlines = [CommentInline] -class UserAdmin2(ModelAdmin2): +class UserAdmin2(djadmin2.ModelAdmin2): create_form_class = UserCreationForm update_form_class = UserChangeForm diff --git a/example/blog/tests/test_apiviews.py b/example/blog/tests/test_apiviews.py index 4eff3ba..97f764c 100644 --- a/example/blog/tests/test_apiviews.py +++ b/example/blog/tests/test_apiviews.py @@ -8,7 +8,7 @@ from django.utils import simplejson as json from djadmin2 import apiviews from djadmin2 import default -from djadmin2.admins import ModelAdmin2 +from djadmin2 import ModelAdmin2 from ..models import Post diff --git a/example/blog/tests/test_permissions.py b/example/blog/tests/test_permissions.py index 166a37c..bf01851 100644 --- a/example/blog/tests/test_permissions.py +++ b/example/blog/tests/test_permissions.py @@ -5,7 +5,7 @@ from django.test import TestCase from django.test.client import RequestFactory import djadmin2 -from djadmin2.admins import ModelAdmin2 +from djadmin2 import ModelAdmin2 from djadmin2.permissions import TemplatePermissionChecker from blog.models import Post