diff --git a/.travis.yml b/.travis.yml index de5b777..f7a3685 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,6 @@ before_install: - export PIP_USE_MIRRORS=true - export PIP_INDEX_URL=https://simple.crate.io/ install: - - python setup.py develop + - pip install -r requirements.txt script: - python runtests.py diff --git a/djadmin2/core.py b/djadmin2/core.py index a289a7a..3109ce5 100644 --- a/djadmin2/core.py +++ b/djadmin2/core.py @@ -25,7 +25,9 @@ class Admin2(object): def register(self, model, modeladmin=None, **kwargs): """ - Registers the given model with the given admin class. + Registers the given model with the given admin class. Once a model is + registered in self.registry, we also add it to app registries in + self.apps. If no modeladmin is passed, it will use ModelAdmin2. If keyword arguments are given they will be passed to the admin class on @@ -33,8 +35,7 @@ class Admin2(object): If a model is already registered, this will raise ImproperlyConfigured. - Once a model is registered in self.registry, we also add it to app registries - in self.apps. + """ if model in self.registry: raise ImproperlyConfigured('%s is already registered in django-admin2' % model) @@ -51,16 +52,25 @@ class Admin2(object): def deregister(self, model): """ - Deregisters the given model. + Deregisters the given model. Remove the model from the self.app as well If the model is not already registered, this will raise ImproperlyConfigured. - - TODO: Remove the model from the self.app as well """ try: del self.registry[model] except KeyError: - raise ImproperlyConfigured + raise ImproperlyConfigured('%s was never registered in django-admin2' % model) + + # Remove the model from the apps registry + # Get the app label + app_label = model._meta.app_label + # Delete the model from it's app registry + del self.apps[app_label][model] + + # if no more models in an app's registry + # then delete the app from the apps. + if self.apps[app_label] is {}: + del self.apps[app_label] # no def autodiscover(self): """ @@ -78,6 +88,7 @@ class Admin2(object): def get_index_kwargs(self): return { 'registry': self.registry, + 'apps': self.apps, } def get_urls(self): diff --git a/djadmin2/exceptions.py b/djadmin2/exceptions.py deleted file mode 100644 index 31a12c8..0000000 --- a/djadmin2/exceptions.py +++ /dev/null @@ -1,2 +0,0 @@ -class NoAdminSpecified(Exception): - pass diff --git a/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css b/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css new file mode 100644 index 0000000..6a29526 --- /dev/null +++ b/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css @@ -0,0 +1,15 @@ +/* Fixes a Bootstrap 2.3 bug. This can be removed when upgrading to Bootstrap v3. */ +.text-right +{ + text-align: right !important; +} + +.text-center +{ + text-align: center !important; +} + +.text-left +{ + text-align: left !important; +} \ No newline at end of file diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/admin2/bootstrap/base.html index 231b9a8..546f26f 100644 --- a/djadmin2/templates/admin2/bootstrap/base.html +++ b/djadmin2/templates/admin2/bootstrap/base.html @@ -7,6 +7,7 @@ +
diff --git a/djadmin2/templates/admin2/bootstrap/index.html b/djadmin2/templates/admin2/bootstrap/index.html index ac8d0e8..203746e 100644 --- a/djadmin2/templates/admin2/bootstrap/index.html +++ b/djadmin2/templates/admin2/bootstrap/index.html @@ -1,10 +1,61 @@ {% extends "admin2/bootstrap/base.html" %} +{% load admin2_urls %} {% block content %} -

Index

- -{% for modeladmin in registry.values %} - -{% endfor %} -
{{ modeladmin.verbose_name_plural }}
+

Site administration

+ +
+
+ {% for app, registry in apps.items %} + + + + + + + + {% for model_class, model_admin in registry.items %} + + + + + + {% endfor %} + +
+ {{ app|title }} +
+ + {{ model_admin.verbose_name_plural|title }} + + +<<<<<<< HEAD + {# if has_add_permission #} + +======= + +>>>>>>> fix-admin-index-links + + + Add + + {# endif #} + +<<<<<<< HEAD + +======= + +>>>>>>> fix-admin-index-links + + Change + +
+ {% endfor %} +
+
+

Recent Actions

+
My Actions
+ TODO +
+
{% endblock content %} diff --git a/djadmin2/templatetags/admin2_urls.py b/djadmin2/templatetags/admin2_urls.py index e5e5395..27d815a 100644 --- a/djadmin2/templatetags/admin2_urls.py +++ b/djadmin2/templatetags/admin2_urls.py @@ -4,5 +4,9 @@ register = template.Library() @register.filter -def admin2_urlname(value, arg): - return 'admin2:%s_%s_%s' % (value.app_label, value.model_name, arg) +def admin2_urlname(view, action): + """ + Converts the view and the specified action into a valid namespaced URLConf name. + """ + return 'admin2:%s_%s_%s' % (view.app_label, view.model_name, action) + diff --git a/djadmin2/views.py b/djadmin2/views.py index 35575d7..5afce4c 100644 --- a/djadmin2/views.py +++ b/djadmin2/views.py @@ -75,11 +75,13 @@ class AdminModel2Mixin(Admin2Mixin, AccessMixin): class IndexView(Admin2Mixin, generic.TemplateView): default_template_name = "index.html" registry = None + apps = None def get_context_data(self, **kwargs): data = super(IndexView, self).get_context_data(**kwargs) data.update({ - 'registry': self.registry + 'apps': self.apps, + 'registry': self.registry, }) return data diff --git a/docs/contributing.rst b/docs/contributing.rst index 40f5261..d1e1946 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -22,7 +22,7 @@ Local Installation 1. Create a **virtualenv**. Activate it. 2. cd into django-admin2 -3. type ``$ python setup.py develop`` +3. type ``$ pip install -r requirements.txt`` Issues! @@ -173,7 +173,7 @@ First we pull the code into a local branch:: Then we run the tests:: - python manage.py test + ./runtests.py We finish with a non-fastforward merge (to preserve the branch history) and push to GitHub:: diff --git a/example/example/settings.py b/example/example/settings.py index 6cf54ad..6de83ad 100644 --- a/example/example/settings.py +++ b/example/example/settings.py @@ -108,6 +108,8 @@ TEMPLATE_DIRS = ( # Don't forget to use absolute paths, not relative paths. ) +TEST_RUNNER = 'django_coverage.coverage_runner.CoverageRunner' + INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', @@ -118,6 +120,7 @@ INSTALLED_APPS = ( 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', + 'django_coverage', 'djadmin2', 'blog', ) @@ -153,3 +156,19 @@ LOGGING = { ADMIN2_THEME_DIRECTORY = "admin2/bootstrap/" + + +########## TOOLBAR CONFIGURATION +# See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation +INSTALLED_APPS += ( + 'debug_toolbar', +) + +# See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation +INTERNAL_IPS = ('127.0.0.1',) + +# See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation +MIDDLEWARE_CLASSES += ( + 'debug_toolbar.middleware.DebugToolbarMiddleware', +) +########## END TOOLBAR CONFIGURATION diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d51dbe7 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,6 @@ +django>=1.5.0 +django-braces==1.0.0 +djangorestframework==2.3.3 +django-debug-toolbar==0.9.4 +coverage==3.6 +django-coverage==1.2.2