diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-02-22 20:58:30 -0500 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-02-22 20:58:30 -0500 |
commit | aa15395a7bba6529c2116e354bda97de2afa5e6f (patch) | |
tree | 92d8940ce63ece55d6fecc2b7a0c6f7f58b57d4f /forum/views | |
parent | c98f611472b65e8be5943fb6e9f134c21d9a0665 (diff) | |
download | askbot-aa15395a7bba6529c2116e354bda97de2afa5e6f.tar.gz askbot-aa15395a7bba6529c2116e354bda97de2afa5e6f.tar.bz2 askbot-aa15395a7bba6529c2116e354bda97de2afa5e6f.zip |
cleaning up small errors, commit in the middle of linting wmd.js
Diffstat (limited to 'forum/views')
-rw-r--r-- | forum/views/users.py | 2 | ||||
-rw-r--r-- | forum/views/writers.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/forum/views/users.py b/forum/views/users.py index 04ffb690..cc05c19e 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -8,9 +8,11 @@ from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext from django.http import HttpResponse, HttpResponseForbidden from django.utils.translation import ugettext as _ +from django.utils.html import strip_tags from django.core.urlresolvers import reverse from forum.forms import *#incomplete list is EditUserForm, ModerateUserForm, TagFilterSelectionForm, from forum import auth +import calendar from django.contrib.contenttypes.models import ContentType question_type = ContentType.objects.get_for_model(Question) diff --git a/forum/views/writers.py b/forum/views/writers.py index 666b936a..a8f07334 100644 --- a/forum/views/writers.py +++ b/forum/views/writers.py @@ -380,7 +380,7 @@ def __generate_comments_json(obj, type, user):#non-view generates json data for if user != None and auth.can_delete_comment(user, comment): #/posts/392845/comments/219852/delete #todo translate this url - delete_url = reverse(index) + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id) + delete_url = reverse('index') + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id) json_comments.append({"id" : comment.id, "object_id" : obj.id, "comment_age" : diff_date(comment.added_at), |