# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1272854971 0
# Node ID 272d3a8c98e8647198c0de8109bc92a9ece73d34
# Parent  da46e77cd8040cfd3749a495e09b331efb6877b2
Some minor tweaks made while rebuilding the development database after Ubuntu 10.04 install.

diff -r da46e77cd804 -r 272d3a8c98e8 gpp/bio/forms.py
--- a/gpp/bio/forms.py	Sat May 01 22:25:49 2010 +0000
+++ b/gpp/bio/forms.py	Mon May 03 02:49:31 2010 +0000
@@ -40,7 +40,9 @@
 
     class Meta:
         model = UserProfile
-        exclude = ('user', 'avatar', 'profile_html', 'signature_html', 'forum_post_count')
+        fields = ('location', 'birthday', 'occupation', 'interests',
+            'profile_text', 'hide_email', 'signature', 'time_zone',
+            'use_24_time', )
 
     class Media:
         css = {
diff -r da46e77cd804 -r 272d3a8c98e8 gpp/downloads/models.py
--- a/gpp/downloads/models.py	Sat May 01 22:25:49 2010 +0000
+++ b/gpp/downloads/models.py	Mon May 03 02:49:31 2010 +0000
@@ -119,7 +119,7 @@
 
 class AllowedExtension(models.Model):
     """Model to represent the list of allowed file extensions."""
-    extension = models.CharField(max_length=8)
+    extension = models.CharField(max_length=8, help_text="e.g. .txt")
 
     objects = AllowedExtensionManager()
 
diff -r da46e77cd804 -r 272d3a8c98e8 gpp/forums/admin.py
--- a/gpp/forums/admin.py	Sat May 01 22:25:49 2010 +0000
+++ b/gpp/forums/admin.py	Mon May 03 02:49:31 2010 +0000
@@ -14,14 +14,17 @@
 
 class CategoryAdmin(admin.ModelAdmin):
     list_display = ('name', 'position', )
+    list_editable = ('position', )
     prepopulated_fields = { 'slug': ('name', ) }
     save_on_top = True
 
 
 class ForumAdmin(admin.ModelAdmin):
     list_display = ('name', 'category', 'position', 'topic_count', 'post_count')
+    list_editable = ('position', )
     prepopulated_fields = { 'slug': ('name', ) }
     raw_id_fields = ('last_post', )
+    ordering = ('category', )
     save_on_top = True
 
 
diff -r da46e77cd804 -r 272d3a8c98e8 gpp/messages/models.py
--- a/gpp/messages/models.py	Sat May 01 22:25:49 2010 +0000
+++ b/gpp/messages/models.py	Mon May 03 02:49:31 2010 +0000
@@ -101,5 +101,7 @@
     def __unicode__(self):
         return self.user.username
 
+    class Meta:
+        verbose_name_plural = "Options"
 
-# vim: ts=4 sw=4
+
diff -r da46e77cd804 -r 272d3a8c98e8 gpp/settings.py
--- a/gpp/settings.py	Sat May 01 22:25:49 2010 +0000
+++ b/gpp/settings.py	Mon May 03 02:49:31 2010 +0000
@@ -238,6 +238,12 @@
         format='%(asctime)s %(levelname)s %(message)s',
         level=local_settings.LOG_LEVEL)
 
+#######################################################################
+# Django Debug Toolbar 
+#######################################################################
+
+if DEBUG:
+    DEBUG_TOOLBAR_CONFIG = local_settings.DEBUG_TOOLBAR_CONFIG
 
 #######################################################################
 # URL's of 3rd party Javascript and CSS files.