Changeset 7979 for django/branches/gis/django/contrib/sites

Timestamp:

07/19/08 08:30:47 (6 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk.

This includes the newforms-admin branch, and thus is backwards-incompatible. The geographic admin is _not_ in this changeset, and is forthcoming.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/contrib/sites/admin.py (copied) (copied from django/trunk/django/contrib/sites/admin.py)
• django/branches/gis/django/contrib/sites/models.py (modified) (3 diffs)

django/branches/gis/django/contrib/sites/models.py

@@ -33 +33 @@
-    name = models.CharField(_('display name'), max_length=50)
-    objects = SiteManager()
+
-    class Meta:
-        db_table = 'django_site'
@@ -38 +39 @@
-        verbose_name_plural = _('sites')
-        ordering = ('domain',)
-    class Admin:
-        list_display = ('domain', 'name')
-        search_fields = ('domain', 'name')
-
-    def __unicode__(self):
-        return self.domain
-
+
-    def delete(self):
-        pk = self.pk
@@ -52 +50 @@
-        except KeyError:
-            pass
-        
-
-class RequestSite(object):