# HG changeset patch # User nishanth # Date 1271490305 -19800 # Node ID 5de0009c0d719434559897bd12aff29ea0dc3fb1 # Parent cd76d507b6cf29d6df899736fe88fb8f72196375 added 500 template and added clean on comments and added comments in view report. diff -r cd76d507b6cf -r 5de0009c0d71 feedback/forms.py --- a/feedback/forms.py Sat Apr 17 11:40:17 2010 +0530 +++ b/feedback/forms.py Sat Apr 17 13:15:05 2010 +0530 @@ -8,5 +8,8 @@ class Meta: model = Feedback - exclude = ['user_ip', 'event', 'day'] + exclude = [ 'event', 'day'] + def clean_comments(self): + comments = self.cleaned_data['comments'] + return comments.strip() diff -r cd76d507b6cf -r 5de0009c0d71 feedback/views.py --- a/feedback/views.py Sat Apr 17 11:40:17 2010 +0530 +++ b/feedback/views.py Sat Apr 17 13:15:05 2010 +0530 @@ -107,6 +107,12 @@ day_feeds = Feedback.objects.filter(event=event,day=day_num) day_report = make_day_report(day_feeds) if day_report: + day_comments = "Comments:
    " + for feed in day_feeds: + if feed.comments: + day_comments += "
  1. %s
  2. "%feed.comments + day_comments += "
" + day_report.append(day_comments) workshop_report.extend( [ "Day %s"%day_num, day_report] ) return render_to_response("show_report.html", {"user":user, "event":event, "workshop_report":workshop_report}) diff -r cd76d507b6cf -r 5de0009c0d71 templates/505.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/505.html Sat Apr 17 13:15:05 2010 +0530 @@ -0,0 +1,5 @@ +{% extends "base.html" %} +{% block content %} +500 Error
+Server encountered some error. This event will be reported.
+{% endblock %}