Fixed url error in measurement-delete page

davebridges · Oct 21, 2013 · d2d0c18 · d2d0c18
1 parent 862dd39
commit d2d0c18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mousedb/data/urls/experiment.py b/mousedb/data/urls/experiment.py
@@ -17,5 +17,5 @@
 	url(r'^data/all$', views.MeasurementList.as_view(), name="measurement_list"),
 	url(r'^data/all.csv$', views.MeasurementListCSV.as_view(), name="measurement_list_csv"),        
 	url(r'^data/(?P<pk>\d*)/edit/$', views.MeasurementUpdate.as_view(), name="measurement-edit"),
-	url(r'^(?P<pk>\d*)/delete/$', views.MeasurementDelete.as_view(), name = "measurement-delete"),
+	url(r'^data/(?P<pk>\d*)/delete/$', views.MeasurementDelete.as_view(), name = "measurement-delete"),
 )
diff --git a/mousedb/data/views.py b/mousedb/data/views.py
@@ -290,7 +290,7 @@ def data_csv(request, measurement_list):
     response = HttpResponse(mimetype='text/csv')
     response['Content-Disposition'] = 'attachment; filename=data.csv'
     writer = csv.writer(response)
-    writer.writerow(["Animal", "Genotype", "Gender","Assay", "Value","Strain", "Age", "Cage", "Feeding", "Treatment"])
+    writer.writerow(["Animal", "Genotype", "Gender","Assay", "Value","Strain", "Background","Age", "Cage", "Feeding", "Treatment"])
     for measurement in measurement_list:
         writer.writerow([
             measurement.animal,
@@ -299,6 +299,7 @@ def data_csv(request, measurement_list):
             measurement.assay,
             measurement.values.split(',')[0],
             measurement.animal.Strain,
+            measurement.animal.Background,
             measurement.age(),
             measurement.animal.Cage,
             measurement.experiment.feeding_state,