From 8e821f5ca1ab83b28ad61f86287b62721f69b35f Mon Sep 17 00:00:00 2001 From: sbussetti Date: Tue, 14 Oct 2014 15:28:11 -0400 Subject: [PATCH 1/5] django 1.6+ compat --- admincommand/admin.py | 12 ++++++------ example/urls.py | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/admincommand/admin.py b/admincommand/admin.py index 5d124a7..7de3ea7 100644 --- a/admincommand/admin.py +++ b/admincommand/admin.py @@ -2,12 +2,12 @@ from django.contrib import admin from django.shortcuts import render from django.contrib.admin.options import csrf_protect_m -from django.http import HttpResponse, HttpResponseRedirect -from django.shortcuts import redirect -from django.conf.urls.defaults import url +from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse -from django.http import HttpResponseBadRequest -from django.conf.urls.defaults import patterns +try: + from django.conf.urls import url, patterns +except ImportError: + from django.conf.urls.defaults import url, patterns from django.utils.encoding import force_unicode from django.utils.functional import update_wrapper from django.http import HttpResponseForbidden @@ -27,7 +27,7 @@ class AdminCommandAdmin(SneakAdmin): def queryset(self, request): # user current user to construct the queryset - # so that only commands the user can execute + # so that only commands the user can execute # will be visible return CommandQuerySet(request.user) diff --git a/example/urls.py b/example/urls.py index faf7e29..a36b9ed 100644 --- a/example/urls.py +++ b/example/urls.py @@ -1,4 +1,7 @@ -from django.conf.urls.defaults import patterns, include, url +try: + from django.conf.urls import url, patterns, include +except ImportError: + from django.conf.urls.defaults import url, patterns, include # Uncomment the next two lines to enable the admin: from django.contrib import admin From 6ff12e48a30dd8a65a2364f9c0ba51a8032f35bf Mon Sep 17 00:00:00 2001 From: sbussetti Date: Tue, 14 Oct 2014 15:30:40 -0400 Subject: [PATCH 2/5] django 1.6+ compat --- admincommand/admin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admincommand/admin.py b/admincommand/admin.py index 7de3ea7..cb0274b 100644 --- a/admincommand/admin.py +++ b/admincommand/admin.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from functools import update_wrapper + from django.contrib import admin from django.shortcuts import render from django.contrib.admin.options import csrf_protect_m @@ -9,7 +11,6 @@ except ImportError: from django.conf.urls.defaults import url, patterns from django.utils.encoding import force_unicode -from django.utils.functional import update_wrapper from django.http import HttpResponseForbidden from django.utils.safestring import mark_safe from django.contrib import messages From c1666346674a264f49428f8527e09a336c65582c Mon Sep 17 00:00:00 2001 From: sbussetti Date: Thu, 4 Dec 2014 11:39:42 -0500 Subject: [PATCH 3/5] fixed packaging --- .gitignore | 6 +++++- MANIFEST.in | 3 +++ setup.py | 9 ++++----- 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 MANIFEST.in diff --git a/.gitignore b/.gitignore index 3afb01e..0d8962c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ *.pyc *~ -example/db.sqlite \ No newline at end of file +example/db.sqlite +django_admincommand.egg-info +.ropeproject +build/ +dist/ diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..0f46a76 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,3 @@ +include README.rst + +recursive-include admincommand/templates * diff --git a/setup.py b/setup.py index 7b8c72b..8178b3f 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import os -from distutils.core import setup +from setuptools import setup, find_packages def read(fname): @@ -15,8 +15,7 @@ def read(fname): author='Djaz Team', author_email='devweb@liberation.fr', url='https://github.com/liberation/django-admincommand', - packages=['admincommand'], - data_files=[('admincommand/templates/admincommand', [ - 'admincommand/templates/admincommand/output.html', - 'admincommand/templates/admincommand/run.html'])] + packages=find_packages(), + include_package_data=True, + zip_safe=False ) From d5f2ef8c627e58a3bf42c256453b173f45ebed3d Mon Sep 17 00:00:00 2001 From: sbussetti Date: Thu, 16 Apr 2015 17:50:08 -0400 Subject: [PATCH 4/5] 1.8+ compat --- admincommand/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admincommand/admin.py b/admincommand/admin.py index cb0274b..e9abf13 100644 --- a/admincommand/admin.py +++ b/admincommand/admin.py @@ -26,7 +26,7 @@ class AdminCommandAdmin(SneakAdmin): list_display = ('command_name',) - def queryset(self, request): + def get_queryset(self, request): # user current user to construct the queryset # so that only commands the user can execute # will be visible From ceed10d36cbb47e04ec62e91d0b2a1e863f1f120 Mon Sep 17 00:00:00 2001 From: sbussetti Date: Thu, 10 Sep 2015 13:58:44 -0400 Subject: [PATCH 5/5] adding Django 1.7 + migrations --- admincommand/migrations/0001_initial.py | 22 ++++++++++++++++++++++ admincommand/migrations/__init__.py | 0 2 files changed, 22 insertions(+) create mode 100644 admincommand/migrations/0001_initial.py create mode 100644 admincommand/migrations/__init__.py diff --git a/admincommand/migrations/0001_initial.py b/admincommand/migrations/0001_initial.py new file mode 100644 index 0000000..400c509 --- /dev/null +++ b/admincommand/migrations/0001_initial.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='AdminCommand', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/admincommand/migrations/__init__.py b/admincommand/migrations/__init__.py new file mode 100644 index 0000000..e69de29