# HG changeset patch # User Anoop Jacob Thomas # Date 1290063547 -19800 # Node ID 01430ed5adf50b14edb5ec8504a5dcf576a0ae16 # Parent 159880292f66879e0e3ff6ad69f56b29ec396d54# Parent 6d719268023b12b86d7214ce0ab0c88e1c47453f Merged heads. diff -r 159880292f66 -r 01430ed5adf5 project/scipycon/user/views.py --- a/project/scipycon/user/views.py Thu Nov 18 12:28:06 2010 +0530 +++ b/project/scipycon/user/views.py Thu Nov 18 12:29:07 2010 +0530 @@ -31,6 +31,9 @@ #User_dump Http404 Error from django.http import Http404 +#for user_dump creation +from project.scipycon.registration.models import Accommodation + @login_required def account(request, scope, template_name="user/account.html"): @@ -297,7 +300,7 @@ accomodation_require = Accommodation.objects.filter(user__username=obj.registrant.username)[0] row['sex'] = accomodation_require.sex except: - row['sex'] = 'Acco. Unspecified' + row['sex'] = '-' row['city'] = obj.city row['organization'] = obj.organisation row['occupation'] = obj.occupation diff -r 159880292f66 -r 01430ed5adf5 project/templates/user/dump.html --- a/project/templates/user/dump.html Thu Nov 18 12:28:06 2010 +0530 +++ b/project/templates/user/dump.html Thu Nov 18 12:29:07 2010 +0530 @@ -4,7 +4,7 @@ -Dump +Scipy User Dump @@ -71,20 +71,12 @@
-

Dump

+

User Dump

-
-

Table of Contents

-
- -
-
+
-

1 Scipy Dump 12 Nov 6:34

@@ -109,7 +101,7 @@ -first namelast nameGenderCityOrganizationOccupationCSTL +first namelast nameGenderCityOrganizationOccupationCSTL {% for row in rows %} {{ row.first_name }}{{ row.last_name }}{{ row.sex }}{{ row.city }}{{ row.organization }}{{ row.occupation }}{{ row.conference }}{{ row.sprint }}{{ row.tutorial }}{{ row.wifi }}