mirror of
https://github.com/jazzband/django-admin2.git
synced 2026-05-02 20:44:52 +00:00
pep8 of code
This commit is contained in:
parent
00dd966b75
commit
28b6a0f72a
7 changed files with 13 additions and 18 deletions
|
|
@ -7,7 +7,7 @@ VERSION = __version__ # synonym
|
|||
# Default datetime input and output formats
|
||||
ISO_8601 = 'iso-8601'
|
||||
|
||||
from . import core
|
||||
from . import core
|
||||
|
||||
|
||||
default = core.Admin2()
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ class Admin2(object):
|
|||
)
|
||||
for model, modeladmin in self.registry.iteritems():
|
||||
app_label = model._meta.app_label
|
||||
model_name = model._meta.object_name.lower()
|
||||
model_name = model._meta.object_name.lower()
|
||||
|
||||
urlpatterns += patterns('',
|
||||
url('^{}/{}/'.format(app_label, model_name),
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ For wont of a better name, this module is called 'models'. It's role is
|
|||
synonymous with the django.contrib.admin.sites model.
|
||||
|
||||
"""
|
||||
import functools
|
||||
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.conf.urls import patterns, include, url
|
||||
from django.conf.urls import patterns, url
|
||||
from django.contrib.auth import models as auth_app
|
||||
from django.db.models import get_models, signals
|
||||
|
||||
|
|
@ -19,7 +19,6 @@ except ImportError:
|
|||
from django import forms
|
||||
|
||||
|
||||
|
||||
class BaseAdmin2(object):
|
||||
|
||||
search_fields = []
|
||||
|
|
@ -49,13 +48,11 @@ class BaseAdmin2(object):
|
|||
readonly_fields = ()
|
||||
ordering = None
|
||||
|
||||
|
||||
def __init__(self, model):
|
||||
super(BaseAdmin2, self).__init__()
|
||||
|
||||
self.model = model
|
||||
|
||||
|
||||
def _user_has_permission(self, user, permission_type, obj=None):
|
||||
""" Generic method for checking whether the user has permission of specified type for the model.
|
||||
Type can be one of view, add, change, delete.
|
||||
|
|
@ -166,7 +163,7 @@ class ModelAdmin2(BaseAdmin2):
|
|||
name=self.get_prefixed_view_name('index')
|
||||
),
|
||||
url(
|
||||
regex=r'^create/$',
|
||||
regex=r'^create/$',
|
||||
view=self.create_view.as_view(**self.get_create_kwargs()),
|
||||
name=self.get_prefixed_view_name('create')
|
||||
),
|
||||
|
|
@ -193,7 +190,6 @@ class ModelAdmin2(BaseAdmin2):
|
|||
return self.get_urls(), None, None
|
||||
|
||||
|
||||
|
||||
def create_permissions(app, created_models, verbosity, **kwargs):
|
||||
"""
|
||||
Creates 'view' permissions for all models.
|
||||
|
|
|
|||
|
|
@ -6,9 +6,11 @@ from django.core.exceptions import ImproperlyConfigured
|
|||
from ..models import ModelAdmin2
|
||||
from ..core import Admin2
|
||||
|
||||
|
||||
class Thing(models.Model):
|
||||
pass
|
||||
|
||||
|
||||
class Admin2Test(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.admin2 = Admin2()
|
||||
|
|
@ -28,7 +30,7 @@ class Admin2Test(unittest.TestCase):
|
|||
|
||||
def test_deregister_error(self):
|
||||
self.assertRaises(ImproperlyConfigured, self.admin2.deregister, Thing)
|
||||
|
||||
|
||||
def test_get_urls(self):
|
||||
self.admin2.register(Thing)
|
||||
self.assertEquals(2, len(self.admin2.get_urls()))
|
||||
|
|
|
|||
|
|
@ -6,10 +6,8 @@ from django.contrib.auth.views import redirect_to_login
|
|||
from django.core.exceptions import PermissionDenied
|
||||
from django.forms.models import modelform_factory
|
||||
from django.views import generic
|
||||
from django.db import models
|
||||
|
||||
from braces.views import LoginRequiredMixin, StaffuserRequiredMixin, AccessMixin
|
||||
|
||||
from braces.views import AccessMixin
|
||||
|
||||
ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "admin2/bootstrap")
|
||||
|
||||
|
|
@ -18,7 +16,7 @@ class Admin2Mixin(object):
|
|||
modeladmin = None
|
||||
model_name = None
|
||||
app_label = None
|
||||
|
||||
|
||||
def get_template_names(self):
|
||||
return [os.path.join(ADMIN2_THEME_DIRECTORY, self.default_template_name)]
|
||||
|
||||
|
|
@ -34,7 +32,6 @@ class Admin2Mixin(object):
|
|||
return modelform_factory(self.get_model())
|
||||
|
||||
|
||||
|
||||
class AdminModel2Mixin(Admin2Mixin, AccessMixin):
|
||||
modeladmin = None
|
||||
# Permission type to check for when a request is sent to this view.
|
||||
|
|
@ -98,7 +95,7 @@ class ModelListView(Admin2Mixin, generic.ListView):
|
|||
context['model'] = self.get_model()._meta.verbose_name
|
||||
context['model_pluralized'] = self.get_model()._meta.verbose_name_plural
|
||||
return context
|
||||
|
||||
|
||||
def get_success_url(self):
|
||||
view_name = 'admin2:{}_{}_detail'.format(self.app_label, self.model_name)
|
||||
return reverse(view_name, kwargs={'pk': self.object.pk})
|
||||
|
|
|
|||
|
|
@ -17,4 +17,4 @@ class UserAdmin2(ModelAdmin2):
|
|||
# Register each model with the admin
|
||||
djadmin2.default.register(Post)
|
||||
djadmin2.default.register(Comment)
|
||||
djadmin2.default.register(User, UserAdmin2)
|
||||
djadmin2.default.register(User, UserAdmin2)
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ class Comment(models.Model):
|
|||
body = models.TextField()
|
||||
|
||||
def __unicode__(self):
|
||||
return self.body
|
||||
return self.body
|
||||
|
|
|
|||
Loading…
Reference in a new issue