0.7.3 bugs

.gitignore

@@ -1,3 +1,4 @@
+/yawd-admin.sublime-workspace
 /.pydevproject
 /.project
 /dist

CHANGES.rst

@@ -3,6 +3,14 @@
 Changelog
 +++++++++
 
+v.0.7.2, 2016.05.27
+===================
+Django 1.7 compatibility
+
+v.0.7.1, 2016.05.24
+===================
+Django 1.6 compatibility
+
 v.0.7.0, 2013.10.23
 ===================
 
@@ -39,4 +47,4 @@ v.0.6.0, 2013.02.28
 v.0.5.0, 2012.11.01
 ====================
 
-* Initial Release
+* Initial Release

README.rst

@@ -1,14 +1,10 @@
 yawd-admin, a django administration website
 ======================================================
 
-yawd-admin now has a live demo at
-`http://yawd-admin.yawd.eu/ <http://yawd-admin.yawd.eu/>`_.
-Use demo / demo as username & passowrd.
-
 .. image:: docs/yawd-admin-screenshot.png
 	:align: center
 
-`yawd-admin <http://yawd.eu/open-source-projects/yawd-admin/>`_ is an 
+yawd-admin is an 
 administration website for django. It extends the default django admin 
 site and offers the following:
 
@@ -22,23 +18,35 @@ site and offers the following:
 * Mechanism for opening the original django admin popup windows with fancybox
 * Seamless integration with `yawd-translations` for multilingual admin websites
 
-.. note::
+History
+==============
+
+master (dev)
+++++++++++++
+is developped under django 1.8.x and does NOT work with older Django releases.
+
+v0.7.2
+++++++++++++
+is developped under django 1.7.x and does NOT work with older Django releases.
+
+v0.7.1
+++++++++++++
+is developped under django 1.6.x and does NOT work with older Django releases.
+
+v0.7.0
+++++++
+is developed under Django 1.5.x and does NOT work with older Django releases.
+
+v0.6.1 
+++++++
 
-	yawd-admin v0.6.1 is the last version intended to work with
-	Django 1.4. yawd-admin v.0.7.0 and on is developed under Django 1.5.x
-	and does NOT work with older Django releases. For those still using
-	Django 1.4, you can checkout the ``0.6.x`` branch or use the yawd-admin
-	v0.6.1 pypi package. New features will not be backported to the ``0.6.x``
-	branch. Since many of us run production systems tied to Django 1.4, both
-	v0.6.1 and the latest documentation will be online on readthedocs.org. 
+is the last version intended to work with Django 1.4. New features will not be backported to the ``0.6.x`` branch. Since many of us run production systems tied to Django 1.4, both v0.6.1 and the latest documentation will be online on readthedocs.org.
 
 Usage and demo
 ==============
 
 See the `yawd-admin documentation <http://yawd-admin.readthedocs.org/en/latest/>`_ 
-for information on how to install the demo and use yawd-admin. There is also an
-online version of the demo at `http://yawd-admin.yawd.eu/ <http://yawd.eu/open-source-projects/yawd-admin/>`_.
-Just use *demo*/*demo* as username and password.
+for information on how to install the demo and use yawd-admin.
 
 Screenshots
 ===========

docs/changelog.rst

@@ -3,6 +3,16 @@
 Changelog
 +++++++++
 
+v.0.7.2, 2016.05.27
+---------------------
+
+* Django 1.7 compatibility
+
+v.0.7.1, 2016.05.24
+---------------------
+
+* Django 1.6 compatibility
+
 v.0.7.0, 2013.10.23
 ---------------------
 

example_project/example_project/settings.py

@@ -31,7 +31,7 @@
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
-SECRET_KEY = '6()e7x_%6*@(_nm$ke)g!ellg)pffm*=288trl)@3u=@l$@5qn'
+SECRET_KEY = '6()e7x_%6*@(_nm$ke)g!ellg)pffm*=288trl)@3u=@l$@5qnm'
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',

setup.py

@@ -2,30 +2,30 @@
 from setuptools import setup, find_packages
 
 setup(
-      name='yawd-admin',
-      url='http://yawd.eu/open-source-projects/yawd-admin/',
-      version = '0.7.1-rc1',
-      description='An administration website for Django',
-      long_description=open('README.rst', 'rt').read(),
-      author='yawd',
-      author_email='info@yawd.eu',
-      packages=find_packages(),
-      license='BSD',
-      classifiers = [
-        'Development Status :: 4 - Beta',
-        'Environment :: Web Environment',
-        'Framework :: Django',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Topic :: Software Development :: Libraries'
-        ],
-      include_package_data = True,
-      install_requires = [
-        "httplib2",
-        "django >= 1.5",
-        "oauth2client"
-        ],
-      zip_safe=False
+    name='yawd-admin',
+    url='http://yawd.eu/open-source-projects/yawd-admin/',
+    version='0.7.3',
+    description='An administration website for Django',
+    long_description=open('README.rst', 'rt').read(),
+    author='yawd',
+    author_email='info@yawd.eu',
+    packages=find_packages(),
+    license='BSD',
+    classifiers=[
+                'Development Status :: 4 - Beta',
+                'Environment :: Web Environment',
+                'Framework :: Django',
+                'Intended Audience :: Developers',
+                'License :: OSI Approved :: BSD License',
+                'Operating System :: OS Independent',
+                'Programming Language :: Python',
+                'Topic :: Software Development :: Libraries'
+    ],
+    include_package_data=True,
+    install_requires=[
+                     "httplib2",
+                     "django >=1.6, <1.9",
+                     "oauth2client"
+    ],
+    zip_safe=False
 )

yawdadmin/__init__.py

@@ -1,10 +1,10 @@
-__version__ = '0.7.1-rc1'
-
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.importlib import import_module
+from importlib import import_module
 from yawdadmin.sites import YawdAdminSite
 
+__version__ = '0.7.2'
+
 
 def _get_site():
     yawdadmin_site = getattr(settings, 'ADMIN_SITE', YawdAdminSite)
@@ -19,5 +19,5 @@ def _get_site():
 
 
 if not isinstance(admin_site, YawdAdminSite):
-    raise ImproperlyConfigured('The specified admin site is not a subclass of '\
+    raise ImproperlyConfigured('The specified admin site is not a subclass of'\
                                'yawdadmin.sites.YawdAdminSite')

yawdadmin/admin.py

@@ -1,8 +1,14 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import json
 from django.conf.urls import patterns, url
 from django.contrib import admin
-from django.contrib.admin.options import InlineModelAdmin 
-from django.contrib.admin.util import unquote, get_deleted_objects
+from django.contrib.admin.options import InlineModelAdmin
+try:
+    from django.contrib.admin.utils import unquote, get_deleted_objects
+except ImportError:  # Django < 1.7
+    from django.contrib.admin.util import unquote, get_deleted_objects
 from django.core.exceptions import PermissionDenied
 from django.db import router
 from django.http import Http404
@@ -15,8 +21,8 @@
 from forms import PopupInlineFormSet
 
 
-try: #django 1.6 and above
-    from django.contrib.admin.options import IS_POPUP_VAR #@UnresolvedImport
+try:  # django 1.6 and above
+    from django.contrib.admin.options import IS_POPUP_VAR  # @UnresolvedImport
 except:
     IS_POPUP_VAR = '_popup'
 
@@ -33,12 +39,13 @@ class PopupInline(InlineModelAdmin):
 class PopupModelAdmin(admin.ModelAdmin):
     linked_inline = None
     popup_only = False
-    
+
     def add_view(self, request, form_url='', extra_context=None):
         if self.popup_only and not IS_POPUP_VAR in request.REQUEST:
             raise Http404
-
-        return super(PopupModelAdmin, self).add_view(request, form_url, extra_context)
+
+        return super(PopupModelAdmin, self).add_view(request,
+            form_url, extra_context)
 
     def ajaxdelete_view(self, request, object_id):
         "The 'delete' admin view for this model."
@@ -71,11 +78,11 @@ def ajaxdelete_view(self, request, object_id):
         self.delete_model(request, obj)
 
         return HttpResponse('<html><body>OK</body></html>')
-    
+
     def change_view(self, request, object_id, form_url='', extra_context=None):
         if self.popup_only and not IS_POPUP_VAR in request.REQUEST:
             raise Http404
-        
+
         return super(PopupModelAdmin, self).change_view(request, object_id, 
                                                         form_url, extra_context)
 
@@ -84,7 +91,7 @@ def formfield_for_dbfield(self, db_field, **kwargs):
         Override foreignkey widget if popup and field matches fk_name
         """
         formfield = super(PopupModelAdmin, self).formfield_for_dbfield(db_field,
-                                                                       **kwargs)
+            **kwargs)
 
         request = kwargs.pop("request", None)
         fk_name = request.GET.get('fk_name')
@@ -103,7 +110,7 @@ def get_urls(self):
         """
         urls = super(PopupModelAdmin, self).get_urls()
 
-        info = self.model._meta.app_label, self.model._meta.module_name
+        info = self.model._meta.app_label, self.model._meta.model_name
         my_urls = patterns('',
             url(r'^(.+)/ajax/delete/$',
                 self.admin_site.admin_view(self.ajaxdelete_view),
@@ -172,7 +179,7 @@ def get_urls(self):
         """
         urls = super(SortableModelAdmin, self).get_urls()
 
-        info = self.model._meta.app_label, self.model._meta.module_name
+        info = self.model._meta.app_label, self.model._meta.model_name
         my_urls = patterns('',
             url(r'^sortables/$',
                 self.admin_site.admin_view(self.sortables),
@@ -188,7 +195,7 @@ def get_urls(self):
 
     def _reorder(self, data, request):
         data = dict([(str(d['pk']), d) for d in data])
-        
+
         data_objects = self.model.objects.filter(pk__in=data.keys())
         for item in data_objects:
             data[str(item.pk)]['object'] = item
@@ -218,7 +225,7 @@ def sortables(self, request):
                                     else 'admin/sortables/list.html',
                                 {'mptt': self.sortable_mptt,
                                  'objects': self.sortables_ordered(self.queryset(request))})
-    
+
     def reorder(self, request):
         if not request.POST.get('data', None):
             return HttpResponse(json.dumps({'message': _('No data sent with the request')}))

yawdadmin/admin_forms.py

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 from django import forms
-from django.contrib.auth import get_user_model
+from django.contrib.auth.models import User
 
 
 class AdminUserModelForm(forms.ModelForm):
     class Meta:
-        model = get_user_model()
+        model = User
         fields = ('username', 'first_name', 'last_name', 'email')