From 17017adde843118278fa2e50815ecad377d62caf Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Thu, 22 Jun 2017 01:02:03 -0500
Subject: [PATCH] Tweak behavior when executing handheld batch results

redirect to final batch when done, try to warn user a bit
---
 tailbone/templates/batch/handheld/index.mako | 6 ++++++
 tailbone/views/batch/core.py                 | 9 +++++++--
 tailbone/views/handheld.py                   | 4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tailbone/templates/batch/handheld/index.mako b/tailbone/templates/batch/handheld/index.mako
index 647125a8..175c277c 100644
--- a/tailbone/templates/batch/handheld/index.mako
+++ b/tailbone/templates/batch/handheld/index.mako
@@ -53,6 +53,12 @@ ${parent.body()}
 <div id="execution-options-dialog" style="display: none;">
   ${h.form(url('{}.execute_results'.format(route_prefix)), name='execute-results')}
   ${h.csrf_token(request)}
+  <br />
+  <p>
+    Please be advised, you are about to execute multiple batches!&nbsp; They will
+    be aggregated and treated as a single data source, during execution.
+  </p>
+  <br />
   % if master.has_execution_options:
       ${rendered_execution_options|n}
   % endif
diff --git a/tailbone/views/batch/core.py b/tailbone/views/batch/core.py
index 73571768..58334de2 100644
--- a/tailbone/views/batch/core.py
+++ b/tailbone/views/batch/core.py
@@ -880,7 +880,7 @@ class BatchMasterView(MasterView):
         # If anything goes wrong, rollback and log the error etc.
         except Exception as error:
             session.rollback()
-            log.exception("execution failed for batch: {}".format(batch))
+            log.exception("execution failed for batch results")
             session.close()
             if progress:
                 progress.session.load()
@@ -899,16 +899,21 @@ class BatchMasterView(MasterView):
                 # TODO: this doesn't always work...?
                 self.request.session.flash("{} {} were executed".format(
                     len(batches), self.get_model_title_plural()))
+                success_url = self.get_execute_results_success_url(result, **kwargs)
             else:
                 session.rollback()
+                success_url = self.get_index_url()
             session.close()
 
             if progress:
                 progress.session.load()
                 progress.session['complete'] = True
-                progress.session['success_url'] = self.get_index_url()
+                progress.session['success_url'] = success_url
                 progress.session.save()
 
+    def get_execute_results_success_url(self, result, **kwargs):
+        return self.get_index_url()
+
     def csv(self):
         """
         Download batch data as CSV.
diff --git a/tailbone/views/handheld.py b/tailbone/views/handheld.py
index b4c0b297..88464dec 100644
--- a/tailbone/views/handheld.py
+++ b/tailbone/views/handheld.py
@@ -199,6 +199,10 @@ class HandheldBatchView(FileBatchMasterView):
             return self.request.route_url('labels.batch.view', uuid=result.uuid)
         return super(HandheldBatchView, self).get_execute_success_url(batch)
 
+    def get_execute_results_success_url(self, result, **kwargs):
+        batch = result
+        return self.get_execute_success_url(batch, result, **kwargs)
+
 
 def includeme(config):
     HandheldBatchView.defaults(config)