From 502263e11b4cced1d2afa5cba913e6b1c8547bdc Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 25 Jul 2015 09:21:43 +1000
Subject: [PATCH] Finishing import/export redirects to the defined url

---
 .../behaviors/ImportExportController.php      | 19 ++++++++++++++++---
 .../partials/_export_result_form.htm          |  6 +++---
 .../partials/_import_result_form.htm          |  6 +++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 243abf6b7..4f79de1dd 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -2,6 +2,7 @@
 
 use Str;
 use Lang;
+use Backend;
 use Backend\Classes\ControllerBehavior;
 use League\Csv\Reader as CsvReader;
 use ApplicationException;
@@ -168,6 +169,7 @@ class ImportExportController extends ControllerBehavior
             ]);
 
             $this->vars['importResults'] = $model->getResultStats();
+            $this->vars['returnUrl'] = $this->getRedirectUrlForType('import');
         }
         catch (Exception $ex) {
             $this->controller->handleError($ex);
@@ -372,11 +374,13 @@ class ImportExportController extends ControllerBehavior
             }
 
             $reference = $model->export($columns, $exportOptions);
-
-            $this->vars['fileUrl'] = $this->controller->actionUrl(
+            $fileUrl = $this->controller->actionUrl(
                 'download',
                 $reference.'/'.$this->exportFileName
-             );
+            );
+
+            $this->vars['fileUrl'] = $fileUrl;
+            $this->vars['returnUrl'] = $this->getRedirectUrlForType('export');
         }
         catch (Exception $ex) {
             $this->controller->handleError($ex);
@@ -549,4 +553,13 @@ class ImportExportController extends ControllerBehavior
 
         return $result;
     }
+
+    protected function getRedirectUrlForType($type)
+    {
+        if ($redirect = $this->getConfig($type.'[redirect]')) {
+            return Backend::url($redirect);
+        }
+
+        return $this->controller->actionUrl($type);
+    }
 }
\ No newline at end of file
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm
index 03ccfed82..fffaf040e 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm
@@ -7,12 +7,12 @@
         </p>
     </div>
     <div class="modal-footer">
-        <button
-            type="button"
+        <a
+            href="<?= $returnUrl ?>"
             class="btn btn-success"
             data-dismiss="popup">
             <?= e(trans('backend::lang.form.complete')) ?>
-        </button>
+        </a>
     </div>
 
     <script> window.location = '<?= $fileUrl ?>' </script>
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm
index 018653e60..1ddacdd9a 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm
@@ -77,12 +77,12 @@
 
     </div>
     <div class="modal-footer">
-        <button
-            type="button"
+        <a
+            href="<?= $returnUrl ?>"
             class="btn btn-success"
             data-dismiss="popup">
             <?= e(trans('backend::lang.form.complete')) ?>
-        </button>
+        </a>
     </div>
 
 <?php else: ?>