Fix for ticket:130.

 * Now displays a message on the summary page rather than returning a useless page.

diff --git a/samplebc/samples/views.py b/samplebc/samples/views.py
index ff6ea26cf48807ba8578a62af9a12b3dd6dff90e..8069f7d8eb805d6085e86dd3963a8c1d45b9f7e0 100644 (file)
--- a/samplebc/samples/views.py
+++ b/samplebc/samples/views.py
@@ -74,7 +74,7 @@ def container_index(request):
 
 
 @login_required
-def container_summary(request, container_id):
+def container_summary(request, container_id, msg=None):
     """
     Returns details of a container
     """
@@ -103,6 +103,7 @@ def container_summary(request, container_id):
     
     # Render prepared samples into container summary
     cc = Context({'container': container,
+                  'msg': msg,
                  'rendered_samples': ts.render(cs) })
     tc = get_template('container_summary.html')
     
@@ -241,7 +242,7 @@ def container_print(request, container_id):
     t = get_template('zpl_container_label.txt')
     print_zpl(t.render(c))
     
-    return HttpResponse('print command for container %s sent.' % (container.uuid))
+    return container_summary(request, container_id, msg='print command for container %s sent.' % (container.uuid))
 
 
 ################################################
@@ -267,7 +268,7 @@ def freezer_index(request):
                               context_instance=RequestContext(request))
     
 @login_required    
-def freezer_summary(request, freezer_id):
+def freezer_summary(request, freezer_id, msg=None):
     """
     Returns summary of freezer_id
     """
@@ -291,7 +292,8 @@ def freezer_summary(request, freezer_id):
     
     
     # Render prepared container index into freezer summary
-    cf = Context({'freezer': freezer })
+    cf = Context({'freezer': freezer,
+                  'msg': msg})
     tf = get_template('freezer_summary.html')
     
     # Render Freezer summary to app html
@@ -424,7 +426,7 @@ def freezer_print(request, freezer_id):
     t = get_template('zpl_freezer_label.txt')
     print_zpl(t.render(c))
     
-    return HttpResponse('print command for freezer %s sent.' % (freezer.uuid))
+    return freezer_summary(request, freezer_id, msg='print command for freezer %s sent.' % (freezer.uuid))
 
 
 ################################################
@@ -687,7 +689,7 @@ def sample_print(request, sampleid):
     t = get_template('half_inch_samples.txt')
     print_zpl(t.render(c))
     
-    return HttpResponse('print command for sample %s sent.' % (sample.sampleid))
+    return sample_summary(request, sampleid, msg='print command for sample %s sent.' % (sample.sampleid))
 
 @login_required
 def user_profile(request):

diff --git a/templates/container_summary.html b/templates/container_summary.html
index 179a6e0599ba94a69a3ffb476d83d5373a9b2ab9..a08d60aa04caa215b3f0164865e021a5b2c48b99 100644 (file)
--- a/templates/container_summary.html
+++ b/templates/container_summary.html
@@ -4,6 +4,13 @@
  | <a href="{{ container.get_absolute_url }}print/">Print Label</a> ]<br />
 <br />
 
+{% if msg %}
+<div class="msg">
+    {{ msg }}
+</div>
+<br />
+{% endif %}
+
 <b>Name:</b> {{ container.name }}<br />
 <b>Freezer:</b> <a href="{{ container.freezer.get_absolute_url }}">{{ container.freezer.name }}</a><br />
 <br />

diff --git a/templates/freezer_summary.html b/templates/freezer_summary.html
index af4820c95538765319cb28f63143c7869f1ad228..5a4ff74a49f0788f5b55ff24a5fd5bf39deeda4e 100644 (file)
--- a/templates/freezer_summary.html
+++ b/templates/freezer_summary.html
@@ -3,6 +3,13 @@
 [ <a href="{{ freezer.get_absolute_url }}edit/">Edit</a> | <a href="{{ freezer.get_absolute_url }}print/">Print Label</a> ]<br />
 <br />
 
+{% if msg %}
+<div class="msg">
+    {{ msg }}
+</div>
+<br />
+{% endif %}
+
 <b>Name:</b> {{ freezer.name }}<br />
 <b>Temp. (C):</b> {{ freezer.temperature }}<br />
 <br />

diff --git a/templates/sample_summary.html b/templates/sample_summary.html
index f05a6340a64552bfa561e34073d09ccd941b7114..d0c911f3e94a9f2efba9fd259d5887a268f93922 100644 (file)
--- a/templates/sample_summary.html
+++ b/templates/sample_summary.html
@@ -1,14 +1,15 @@
 <h2>Sample Summary</h2>
 
 [ <a href="{{ sample.get_absolute_url }}edit/">Edit</a> | <a href="{{ sample.get_absolute_url }}print/">Print Label</a> ]<br />
+<br />
 
 {% if msg %}
 <div class="msg">
     {{ msg }}
 </div>
+<br />
 {% endif %}
 
-<br />
 <b>Name:</b> {{ sample.name }}<br />
 <b>SampleID:</b> {{ sample.sampleid }}<br />
 <b>Type:</b> {{ sample.sample_type.name }}<br />