Merge pull request #10 from crccheck/better-naked

Add a way to opt out of template helpers

Author: crccheck

Diff for: README.rst

@@ -7,32 +7,28 @@ If you've ever tried making your own admin object tools and you were
 like me, you immediately gave up. Why can't they be as easy as making
 Django Admin Actions? Well now they can be.
 
-Similar Packages
-~~~~~~~~~~~~~~~~
-
-Django Object Actions is very similar to
-`django-object-tools <https://github.com/praekelt/django-object-tools>`_,
-but does not require messing with your urls.py, does not do anything
-special with permissions, and uses the same patterns as making `admin
-actions <https://docs.djangoproject.com/en/dev/ref/contrib/admin/actions/#actions-as-modeladmin-methods>`_
-in Django.
-
-Installation
-------------
+Quick-Start Guide
+-----------------
 
 Install Django Object Actions::
 
     pip install django-object-actions
 
 Add ``django_object_actions`` to your ``INSTALLED_APPS``.
 
-Alternate Installation
-~~~~~~~~~~~~~~~~~~~~~~
+In your admin.py::
+
+    from django_object_actions import DjangoObjectActions
+
+
+    class ArticleAdmin(DjangoObjectActions, admin.ModelAdmin):
+        def publish_this(self, request, obj):
+            publish_obj(obj)
+        publish_this.label = "Publish"  # optional
+        publish_this.short_description = "Submit this article to The Texas Tribune"  # optional
+
+        objectactions = ('publish_this', )
 
-You don't have to add this to ``INSTALLED_APPS``, all you need to to do is copy
-the template ``django_object_actions/change_form.html`` some place Django's
-template loader `will find it
-<https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs>`_.
 
 Usage
 -----
@@ -42,13 +38,14 @@ Tools are defined just like defining actions as modeladmin methods, see:
 actions <https://docs.djangoproject.com/en/dev/ref/contrib/admin/actions/#actions-as-modeladmin-methods>`_
 for examples and detailed syntax. You can return nothing or an http
 response. The major difference being the functions you write will take
-an object instance instead of a queryset::
-
-    def toolfunc(self, request, obj)
+an object instance instead of a queryset (see *Re-using Admin Actions* below).
 
 Tools are exposed by putting them in an ``objectactions`` attribute in
 your modeladmin like::
 
+    from django_object_actions import DjangoObjectActions
+
+
     class MyModelAdmin(DjangoObjectActions, admin.ModelAdmin):
         def toolfunc(self, request, obj):
             pass
@@ -62,15 +59,18 @@ Normally, you would do something to the object and go back to the same
 place, but if you return a HttpResponse, it will follow it (hey, just
 like actions!).
 
+If your admin modifies ``get_urls``, ``render_change_form``, or
+``change_form_template``, you'll need to take extra care.
+
 Re-using Admin Actions
 ``````````````````````
 
 If you would like an admin action to also be an object tool, add the
 ``takes_instance_or_queryset`` decorator like::
 
 
-    from django_object_actions import DjangoObjectActions
-    from django_object_actions.utils import takes_instance_or_queryset
+    from django_object_actions import (DjangoObjectActions,
+            takes_instance_or_queryset)
 
 
     class RobotAdmin(DjangoObjectActions, admin.ModelAdmin):
@@ -83,16 +83,30 @@ If you would like an admin action to also be an object tool, add the
         objectactions = ['tighten_lug_nuts']
         actions = ['tighten_lug_nuts']
 
+Alternate Installation
+``````````````````````
+
+You don't have to add this to ``INSTALLED_APPS``, all you need to to do is copy
+the template ``django_object_actions/change_form.html`` some place Django's
+template loader `will find it
+<https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs>`_.
+
+If you don't intend to use the template customizations at all, don't add
+``django_object_actions`` to your ``INSTALLED_APPS`` at all and use
+``BaseDjangoObjectActions`` instead of ``DjangoObjectActions``.
+
 
 Limitations
-~~~~~~~~~~~
+-----------
 
 1. ``django-object-actions`` expects functions to be methods of the model admin.
+   While Django gives you a lot more options for their admin actions.
 
 2. If you provide your own custom ``change_form.html``, you'll also need to
    manually copy in the relevant bits of `our change form
    <https://github.com/texastribune/django-object-actions/blob/master/django_obj
-   ect_actions/templates/django_object_actions/change_form.html>`_.
+   ect_actions/templates/django_object_actions/change_form.html>`_. You can also
+   use ``from django_object_actions import BaseDjangoObjectActions`` instead.
 
 Development
 -----------
@@ -107,12 +121,23 @@ Getting started *(with virtualenvwrapper)*::
     pip install -r requirements-dev.txt
     export DJANGO_SETTINGS_MODULE=example_project.settings
     add2virtualenv .
-    # start doing stuff
-    make test
-    make resetdb
-    python example_project/manage.py runserver
+    make test  # run test suite
+    tox  # run full test suite, requires more setup
+    make resetdb  # reset the example db
+    python example_project/manage.py runserver  # run debug server
 
-The fixtures will create a user, admin:admin, you can use to log in
-immediately.
+The fixtures will create a user, admin:admin, you can use to log in immediately.
 
 Various helpers are available as make commands.
+
+
+Similar Packages
+----------------
+
+Django Object Actions is very similar to
+`django-object-tools <https://github.com/praekelt/django-object-tools>`_,
+but does not require messing with your urls.py, does not do anything
+special with permissions, and uses the same patterns as making `admin
+actions <https://docs.djangoproject.com/en/dev/ref/contrib/admin/actions/#actions-as-modeladmin-methods>`_
+in Django.
+

Diff for: django_object_actions/__init__.py

@@ -2,4 +2,9 @@
 __version__ = "0.1.1"
 
 
-from .utils import DjangoObjectActions
+# kind of like __all__, make these available for public
+from .utils import (
+    BaseDjangoObjectActions,
+    DjangoObjectActions,
+    takes_instance_or_queryset,
+)

Diff for: django_object_actions/utils.py

@@ -8,10 +8,8 @@
 from django.views.generic.detail import SingleObjectMixin
 
 
-class DjangoObjectActions(object):
+class BaseDjangoObjectActions(object):
     """ModelAdmin mixin to add object-tools just like adding admin actions."""
-    # override default change_form_template
-    change_form_template = "django_object_actions/change_form.html"
     # list to hold each object action tool
     objectactions = []
 
@@ -26,9 +24,13 @@ def get_tool_urls(self):
         )
         return my_urls
 
+    ###################################
+    # EXISTING ADMIN METHODS MODIFIED #
+    ###################################
+
     def get_urls(self):
         """Prepends `get_urls` with our own patterns."""
-        urls = super(DjangoObjectActions, self).get_urls()
+        urls = super(BaseDjangoObjectActions, self).get_urls()
         return self.get_tool_urls() + urls
 
     def render_change_form(self, request, context, **kwargs):
@@ -43,10 +45,15 @@ def to_dict(tool_name):
                 short_description=getattr(tool, 'short_description', ''))
 
         context['objectactions'] = [to_dict(x) for x in self.objectactions]
-        return super(DjangoObjectActions, self).render_change_form(request,
+        return super(BaseDjangoObjectActions, self).render_change_form(request,
             context, **kwargs)
 
 
+class DjangoObjectActions(BaseDjangoObjectActions):
+    # override default change_form_template
+    change_form_template = "django_object_actions/change_form.html"
+
+
 class ModelToolsView(SingleObjectMixin, View):
     """A special view that run the tool's callable."""
     tools = {}

Diff for: example_project/polls/admin.py

@@ -3,8 +3,8 @@
 from django.db.models import F
 from django.http import HttpResponseRedirect
 
-from django_object_actions import DjangoObjectActions
-from django_object_actions.utils import takes_instance_or_queryset
+from django_object_actions import (DjangoObjectActions,
+        takes_instance_or_queryset)
 
 from .models import Choice, Poll