Submitter:	Christian Hammond	Reviewers
Branch:	trunk	Groups:	reviewboard
Bugs:		People:
Change Number:	None	Repository:	Review Board SVN

Description:

The Django newforms-admin and full newforms migrations happened in trunk recently, so we needed to update accordingly.

This change strips out all the inner Admin classes from the models and moves to the new Admin classes in admin.py files. We auto-discover early on (making sure we only do it once so that we don't break unit tests -- will need to ask Django to fix this in the future). We also move to importing django.forms instead of django.newforms.

Testing Done:

Ran all unit tests and made sure the admin site was working as expected.

Diff revision 1 (Latest)

Files Changed:

/trunk/reviewboard/manage.py: 2 changes [ 1 2 ]
/trunk/reviewboard/urls.py: 2 changes [ 1 2 ]
/trunk/reviewboard/accounts/admin.py: 1 change [ new content ]
/trunk/reviewboard/accounts/forms.py: 2 changes [ 1 2 ]
/trunk/reviewboard/accounts/models.py: 6 changes [ 1 2 3 4 5 6 ]
/trunk/reviewboard/admin/urls.py: 2 changes [ 1 2 ]
/trunk/reviewboard/diffviewer/admin.py: 1 change [ new content ]
/trunk/reviewboard/diffviewer/forms.py: 1 change [ 1 ]
/trunk/reviewboard/diffviewer/models.py: 6 changes [ 1 2 3 4 5 6 ]
/trunk/reviewboard/htdocs/media/admin/css/forms.css: 1 change [ 1 ]
/trunk/reviewboard/htdocs/media/admin/js/urlify.js: 1 change [ 1 ]
/trunk/reviewboard/htdocs/media/admin/js/admin/CollapsedFieldsets.js: 1 change [ 1 ]
/trunk/reviewboard/htdocs/media/admin/js/admin/RelatedObjectLookups.js: 2 changes [ 1 2 ]
/trunk/reviewboard/reviews/admin.py: 1 change [ new content ]
/trunk/reviewboard/reviews/forms.py: 1 change [ 1 ]
/trunk/reviewboard/reviews/models.py: 48 changes [ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 ]
/trunk/reviewboard/scmtools/admin.py: 1 change [ new content ]
/trunk/reviewboard/scmtools/models.py: 3 changes [ 1 2 3 ]
/trunk/reviewboard/templates/admin/base_site.html: 1 change [ 1 ]
/trunk/reviewboard/templates/admin/dashboard.html: 1 change [ 1 ]
/trunk/reviewboard/templates/admin/database.html: 2 changes [ 1 2 ]
/trunk/reviewboard/templates/admin/index.html: 2 changes [ 1 2 ]

Expand changes

     # Python 2.4
     if sys.version_info[0] < 2 or \
        (sys.version_info[0] == 2 and sys.version_info[1] < 4):
         dependency_error('Python 2.4 or newer is required.')
-    # Django 0.97
+    # Django ~1.0 alpha
     try:
         import django
         if django.VERSION[0] == 0 and django.VERSION[1] < 97:
             raise ImportError
-        # QuerySet refactor (r7477)
+        # newforms-admin and newforms -> forms (r7971)
-        from django.core.exceptions import FieldError
+        import django.forms.widgets
     except ImportError:
         dependency_error("Django > 0.97 (or SVN >= r7477) is required.")
     # django-evolution
     try:

 import os.path
 from django.conf import settings
 from django.conf.urls.defaults import patterns, include, url
 from django.contrib import admin
 from reviewboard.admin.checks import check_updates_required
 from reviewboard.reviews.feeds import RssReviewsFeed, AtomReviewsFeed, \
                                       RssSubmitterReviewsFeed, \
                                       AtomSubmitterReviewsFeed, \
                                       RssGroupReviewsFeed, \
                                       AtomGroupReviewsFeed
 # Load in all the models for the admin UI.
 if not admin.site._registry:
     admin.autodiscover()
 # URLs global to all modes
 urlpatterns = patterns('',
     (r'^admin/', include('reviewboard.admin.urls')),
+)

 from django.contrib import admin
 from reviewboard.accounts.models import ReviewRequestVisit, Profile
 class ProfileAdmin(admin.ModelAdmin):
     list_display = ('__unicode__', 'first_time_setup_done')
     raw_id_fields = ('user', 'starred_review_requests', 'starred_groups')
 print "Registering ReviewRequestVisit"
 admin.site.register(ReviewRequestVisit)
 admin.site.register(Profile, ProfileAdmin)

-from django import newforms as forms
+from django import forms
 from django.conf import settings
-from django.newforms import widgets
+from django.forms import widgets
 from django.utils.translation import ugettext as _
 from reviewboard.reviews.models import Group

 from datetime import datetime
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from djblets.util.db import ConcurrencyManager
 from reviewboard.reviews.models import Group, ReviewRequest
 # Hack the admin display to include the is_active field
-User._meta.admin.list_display += ('is_active',)
+#User._meta.admin.list_display += ('is_active',)
-User._meta.admin.list_filter += ('is_active',)
+#User._meta.admin.list_filter += ('is_active',)
 class ReviewRequestVisit(models.Model):
     """
     A recording of the last time a review request was visited by a user.
     # A list of starred review requests. This allows users to monitor a
     # review request and receive e-mails on updates without actually being
     # on the reviewer list or commenting on the review. This is similar to
     # adding yourself to a CC list.
-    starred_review_requests = models.ManyToManyField(
+    starred_review_requests = models.ManyToManyField(ReviewRequest,
-        ReviewRequest, core=False, blank=True,
+                                                     core=False, blank=True,
-        filter_interface=models.HORIZONTAL,
-        related_name="starred_by")
+                                                     related_name="starred_by")
     # A list of watched groups. This is so that users can monitor groups
     # without actually joining them, preventing e-mails being sent to the
     # user and review requests from entering the Incoming Reviews list.
-    starred_groups = models.ManyToManyField(
+    starred_groups = models.ManyToManyField(Group, core=False, blank=True,
-        Group, core=False, blank=True, filter_interface=models.HORIZONTAL,
-        related_name="starred_by")
+                                            related_name="starred_by")
     def __unicode__(self):
         return self.user.username
-    class Admin:
-        list_display = ('__unicode__', 'first_time_setup_done')

 from django.conf.urls.defaults import *
 from django.contrib import admin
 NEWS_FEED = "http://www.review-board.org/news/feed/"
 urlpatterns = patterns('reviewboard.admin.views',
     ('^$', 'dashboard'),
     ('^cache/$', 'cache_stats'),
+)
 urlpatterns += patterns('',
-    ('^db/', include('django.contrib.admin.urls')),
+    ('^db/(.*)', admin.site.root),
     ('^feed/news/$', 'djblets.feedview.views.view_feed',
      {'template_name': 'admin/feed.html',
       'url': NEWS_FEED}),
     ('^feed/news/rss/$', 'django.views.generic.simple.redirect_to',
      {'url': NEWS_FEED}),
+)

 from django.contrib import admin
 from reviewboard.diffviewer.models import FileDiff, DiffSet, DiffSetHistory
 class FileDiffAdmin(admin.ModelAdmin):
     fieldsets = (
         (None, {
             'fields': ('diffset', ('source_file', 'source_revision'),
                        ('dest_file', 'dest_detail'),
                        'binary', 'diff', 'parent_diff')
         }),
+    )
     list_display = ('source_file', 'source_revision',
                     'dest_file', 'dest_detail')
     raw_id_fields = ('diffset',)
 class DiffSetAdmin(admin.ModelAdmin):
     list_display = ('__unicode__', 'revision', 'timestamp')
     raw_id_fields = ('history',)
 admin.site.register(FileDiff, FileDiffAdmin)
 admin.site.register(DiffSet, DiffSetAdmin)
 admin.site.register(DiffSetHistory)

 import os
-from django import newforms as forms
+from django import forms
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext as _
 from reviewboard.diffviewer.diffutils import DEFAULT_DIFF_COMPAT_VERSION
 from reviewboard.diffviewer.models import DiffSet, FileDiff

     This contains the patch and information needed to produce original and
     patched versions of a single file in a repository.
     """
     diffset = models.ForeignKey('DiffSet', edit_inline=models.STACKED,
                                 related_name='files',
-                                verbose_name=_("diff set"),
+                                verbose_name=_("diff set"))
-                                raw_id_admin=True)
     source_file = models.CharField(_("source file"), max_length=256, core=True)
     dest_file = models.CharField(_("destination file"), max_length=256,
                                  core=True)
     source_revision = models.CharField(_("source file revision"), max_length=512)
     def __unicode__(self):
         return u"%s (%s) -> %s (%s)" % (self.source_file, self.source_revision,
                                         self.dest_file, self.dest_detail)
-    class Admin:
-        list_display = ('source_file', 'source_revision',
-                        'dest_file', 'dest_detail')
-        fields = (
-            (None, {
-                'fields': ('diffset', ('source_file', 'source_revision'),
-                           ('dest_file', 'dest_detail'),
-                           'binary', 'diff', 'parent_diff')
-            }),
 class DiffSet(models.Model):
     """
     A revisioned collection of FileDiffs.
     """
     name = models.CharField(_('name'), max_length=256, core=True)
     revision = models.IntegerField(_("revision"), core=True)
     timestamp = models.DateTimeField(_("timestamp"), default=datetime.now)
     history = models.ForeignKey('DiffSetHistory', null=True, core=True,
-                                raw_id_admin=True,
                                 related_name="diffsets",
                                 verbose_name=_("diff set history"))
     repository = models.ForeignKey(Repository, related_name="diffsets",
                                    verbose_name=_("repository"))
     diffcompat = models.IntegerField(
         super(DiffSet, self).save()
     def __unicode__(self):
         return u"[%s] %s r%s" % (self.id, self.name, self.revision)
-    class Admin:
-        list_display = ('__unicode__', 'revision', 'timestamp')
     class Meta:
         get_latest_by = 'revision'
         ordering = ['revision', 'timestamp']
     timestamp = models.DateTimeField(_("timestamp"), default=datetime.now)
     def __unicode__(self):
         return u'Diff Set History (%s revisions)' % self.diffsets.count()
-    class Admin:
+    class Meta:
-        pass
+        verbose_name_plural = "Diff set histories"

 .vDateField, .vTimeField { margin-right:2px; }
 .vURLField { width:30em; }
 .vLargeTextField, .vXMLLargeTextField { width:48em; }
 .flatpages-flatpage #id_content { height:40.2em; }
 .module table .vPositiveSmallIntegerField { width:2.2em; }
 /* x unsorted */
 .inline-group {padding:10px; padding-bottom:5px; background:#eee; margin:10px 0;}
 .inline-group h3.header {margin:-5px -10px 5px -10px; background:#bbb; color:#fff; padding:2px 5px 3px 5px; font-size:11px}
 .inline-related {margin-bottom:15px; position:relative;}
 .last-related {margin-bottom:0px;}
 .inline-related h2 { margin:0; padding:2px 5px 3px 5px; font-size:11px; text-align:left; font-weight:bold;  color:#888; }
 .inline-related h2 b {font-weight:normal; color:#aaa;}
 .inline-related h2 span.delete {padding-left:20px; position:absolute; top:0px; right:5px;}
 .inline-related h2 span.delete label {margin-left:2px; padding-top:1px;}
 .inline-related fieldset {background:#fbfbfb;}
 .inline-related fieldset.module h2 { margin:0; padding:2px 5px 3px 5px; font-size:11px; text-align:left; font-weight:bold; background:#bcd; color:#fff; }
 .inline-related.tabular fieldset.module table {width:100%;}
 .inline-group .tabular tr.has_original td {padding-top:2em;}
 .inline-group .tabular tr td.original { padding:2px 0 0 0; width:0; _position:relative; }
 .inline-group .tabular th.original {width:0px; padding:0;}
 .inline-group .tabular td.original p {position:absolute; left:0; height:1.1em; padding:2px 7px; overflow:hidden; font-size:9px; font-weight:bold; color:#666; _width:700px;     }
 .inline-group ul.tools {padding:0; margin: 0; list-style:none;}
 .inline-group ul.tools li {display:inline; padding:0 5px;}
 .inline-group ul.tools a.add {background:url(../img/admin/icon_addlink.gif) 0 50% no-repeat; padding-left:14px;}

 var LATIN_MAP = {
     'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE', 'Ç':
     'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', 'Î': 'I',
     'Ï': 'I', 'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ö':
     'O', 'Ő': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', 'Ü': 'U', 'Ű': 'U',
     'Ý': 'Y', 'Þ': 'TH', 'ß': 'ss', 'à':'a', 'á':'a', 'â': 'a', 'ã': 'a', 'ä':
     'a', 'å': 'a', 'æ': 'ae', 'ç': 'c', 'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e',
     'ì': 'i', 'í': 'i', 'î': 'i', 'ï': 'i', 'ð': 'o', 'ñ': 'n'

Review Board

beta

This change has been marked as submitted.

Migrate to newforms-admin and django.forms

Diff revision 1 (Latest)