From 603db79ca1e2ba2b27928d40e53f4be7b12b36d0 Mon Sep 17 00:00:00 2001
From: Raphael Kimmig <raphael.kimmig@ampad.de>
Date: Sun, 19 May 2013 15:16:21 +0200
Subject: [PATCH] rename modeladmin to model_admin fixes #91

---
 djadmin2/core.py                               | 14 +++++++-------
 djadmin2/models.py                             |  2 +-
 djadmin2/templates/admin2/bootstrap/index.html |  4 ++--
 djadmin2/views.py                              | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/djadmin2/core.py b/djadmin2/core.py
index a8477b5..ffb4cea 100644
--- a/djadmin2/core.py
+++ b/djadmin2/core.py
@@ -22,11 +22,11 @@ class Admin2(object):
         self.registry = {}
         self.name = name
 
-    def register(self, model, modeladmin=None, **kwargs):
+    def register(self, model, model_admin=None, **kwargs):
         """
         Registers the given model with the given admin class.
 
-        If no modeladmin is passed, it will use ModelAdmin2. If keyword
+        If no model_admin is passed, it will use ModelAdmin2. If keyword
         arguments are given they will be passed to the admin class on
         instantiation.
 
@@ -34,9 +34,9 @@ class Admin2(object):
         """
         if model in self.registry:
             raise ImproperlyConfigured
-        if not modeladmin:
-            modeladmin = models.ModelAdmin2
-        self.registry[model] = modeladmin(model, **kwargs)
+        if not model_admin:
+            model_admin = models.ModelAdmin2
+        self.registry[model] = model_admin(model, **kwargs)
 
     def deregister(self, model):
         """
@@ -71,13 +71,13 @@ class Admin2(object):
         urlpatterns = patterns('',
             url(r'^$', self.index_view.as_view(**self.get_index_kwargs()), name='dashboard'),
         )
-        for model, modeladmin in self.registry.iteritems():
+        for model, model_admin in self.registry.iteritems():
             app_label = model._meta.app_label
             model_name = model._meta.object_name.lower()        
 
             urlpatterns += patterns('',
                 url('^{}/{}/'.format(app_label, model_name),
-                    include(modeladmin.urls)),
+                    include(model_admin.urls)),
             )
         return urlpatterns
 
diff --git a/djadmin2/models.py b/djadmin2/models.py
index 7f73dca..99e3c17 100644
--- a/djadmin2/models.py
+++ b/djadmin2/models.py
@@ -126,7 +126,7 @@ class ModelAdmin2(BaseAdmin2):
             'app_label': self.app_label,
             'model': self.model,
             'model_name': self.model_name,
-            'modeladmin': self,
+            'model_admin': self,
         }
 
     def get_prefixed_view_name(self, view_name):
diff --git a/djadmin2/templates/admin2/bootstrap/index.html b/djadmin2/templates/admin2/bootstrap/index.html
index ac8d0e8..1ca538b 100644
--- a/djadmin2/templates/admin2/bootstrap/index.html
+++ b/djadmin2/templates/admin2/bootstrap/index.html
@@ -3,8 +3,8 @@
 {% block content %}
 <h1>Index</h1>
 <table>
-{% for modeladmin in registry.values %}
-    <tr><td><a href="{{ modeladmin.get_index_url }}">{{ modeladmin.verbose_name_plural }}</a></td></tr>
+{% for model_admin in registry.values %}
+    <tr><td><a href="{{ model_admin.get_index_url }}">{{ model_admin.verbose_name_plural }}</a></td></tr>
 {% endfor %}
 </table>
 {% endblock content %}
diff --git a/djadmin2/views.py b/djadmin2/views.py
index 00e261a..0a8c516 100644
--- a/djadmin2/views.py
+++ b/djadmin2/views.py
@@ -15,7 +15,7 @@ ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "admin2/boo
 
 
 class Admin2Mixin(object):
-    modeladmin = None
+    model_admin = None
     model_name = None
     app_label = None
     
@@ -36,14 +36,14 @@ class Admin2Mixin(object):
 
 
 class AdminModel2Mixin(Admin2Mixin, AccessMixin):
-    modeladmin = None
+    model_admin = None
     # Permission type to check for when a request is sent to this view.
     permission_type = None
 
     def dispatch(self, request, *args, **kwargs):
         # Check if user has necessary permissions. If the permission_type isn't specified then check for staff status.
         print "distpatch perm check:", self.permission_type
-        has_permission = self.modeladmin.has_permission(request, self.permission_type) \
+        has_permission = self.model_admin.has_permission(request, self.permission_type) \
             if self.permission_type else request.user.is_staff
         # Raise exception or redirect to login if user doesn't have permissions.
         if not has_permission:
@@ -58,9 +58,9 @@ class AdminModel2Mixin(Admin2Mixin, AccessMixin):
     def get_context_data(self, **kwargs):
         context = super(AdminModel2Mixin, self).get_context_data(**kwargs)
         context.update({
-            'has_add_permission': self.modeladmin.has_add_permission(self.request),
-            'has_edit_permission': self.modeladmin.has_edit_permission(self.request),
-            'has_delete_permission': self.modeladmin.has_delete_permission(self.request),
+            'has_add_permission': self.model_admin.has_add_permission(self.request),
+            'has_edit_permission': self.model_admin.has_edit_permission(self.request),
+            'has_delete_permission': self.model_admin.has_delete_permission(self.request),
         })
         return context