ALteration of the schema to a single content model. As a bonus there is a complete...

[osqa.git] / forum / views / meta.py

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 6417e8f51cd110fc6c6b00a50bdb2cb7ee9c7ec2..02cfbf77cae19d0c601711a01a3afa60bfe080ac 100644 (file)
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -2,15 +2,21 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
 from django.http import HttpResponseRedirect, HttpResponse
+from django.conf import settings
 from forum.forms import FeedbackForm
 from django.core.urlresolvers import reverse
 from django.core.mail import mail_admins
 from django.utils.translation import ugettext as _
 from forum.utils.forms import get_next_url
 from forum.models import Badge, Award
+from forum.badges import ALL_BADGES
+from forum import settings
+
+def favicon(request):
+    return HttpResponseRedirect(str(settings.APP_FAVICON))
 
 def about(request):
-    return render_to_response('about.html', context_instance=RequestContext(request))
+    return render_to_response('about.html', {'text': settings.ABOUT_PAGE_TEXT.value }, context_instance=RequestContext(request))
 
 def faq(request):
     data = {
@@ -59,6 +65,14 @@ def logout(request):#refactor/change behavior?
 
 def badges(request):#user status/reputation system
     badges = Badge.objects.all().order_by('name')
+
+    badges_dict = dict([(badge.badge, badge.description) for badge in ALL_BADGES])
+
+    for badge in badges:
+        if badge.description != badges_dict.get(badge.slug, badge.description):
+            badge.description = badges_dict[badge.slug]
+            badge.save()
+    
     my_badges = []
     if request.user.is_authenticated():
         my_badges = Award.objects.filter(user=request.user).values('badge_id')
@@ -75,12 +89,12 @@ def badge(request, id):
     awards = Award.objects.extra(
         select={'id': 'auth_user.id', 
                 'name': 'auth_user.username', 
-                'rep':'auth_user.reputation', 
-                'gold': 'auth_user.gold', 
-                'silver': 'auth_user.silver', 
-                'bronze': 'auth_user.bronze'},
-        tables=['award', 'auth_user'],
-        where=['badge_id=%s AND user_id=auth_user.id'],
+                'rep':'forum_user.reputation',
+                'gold': 'forum_user.gold',
+                'silver': 'forum_user.silver',
+                'bronze': 'forum_user.bronze'},
+        tables=['award', 'auth_user', 'forum_user'],
+        where=['badge_id=%s AND user_id=auth_user.id AND forum_user.user_ptr_id = auth_user.id'],
         params=[id]
     ).distinct('id')