From fa56e1f5fed7909e2181838d9bb694bde2b05a27 Mon Sep 17 00:00:00 2001
From: lonalore <lonalore@freemail.hu>
Date: Thu, 20 Oct 2016 09:00:58 +0200
Subject: [PATCH 1/2] Issue #1947 Ability to override after submit options with
 $afterSubmitOptions property in controller.

---
 e107_handlers/admin_ui.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 94a2902e5..724b9c590 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -2513,6 +2513,16 @@ class e_admin_controller_ui extends e_admin_controller
 	 */
 	protected $_alias_parsed = false;
 
+	/**
+	 * @var bool
+	 */
+	protected $afterSubmitOptions = true;
+
+	public function getAfterSubmitOptions()
+	{
+		return $this->afterSubmitOptions;
+	}
+
 	public function getBatchDelete()
 	{
 		return $this->batchDelete;
@@ -5789,7 +5799,7 @@ class e_admin_form_ui extends e_form
 						'fields' => $controller->getFields(), //see e_admin_ui::$fields
 						'header' => $form_start, //XXX Unused?
 						'footer' => $form_end,  //XXX Unused?
-						'after_submit_options' => true, // or true for default redirect options
+						'after_submit_options' => $controller->getAfterSubmitOptions(), // or true for default redirect options
 						'after_submit_default' => $request->getPosted('__after_submit_action', $controller->getDefaultAction()), // or true for default redirect options
 						'triggers' => 'auto', // standard create/update-cancel triggers
 					)

From dfab3627bce4280f5f5cd6fbfd6192b2c7be11bc Mon Sep 17 00:00:00 2001
From: lonalore <lonalore@freemail.hu>
Date: Thu, 20 Oct 2016 10:30:59 +0200
Subject: [PATCH 2/2] Use custom option list instead of default. Default is
 used only if no custom option list.

---
 e107_handlers/form_handler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index ffee17447..79887c6e7 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -5996,7 +5996,7 @@ class e_form
 									<li class="dropdown-header nav-header">After submit:</li>
 							';
 							
-							foreach($defsubmitopt as $k=>$v)
+							foreach($submitopt as $k=>$v)
 							{
 								$text .= "<li class='after-submit'>".$this->radio('__after_submit_action', $k, $selected == $k, "label=".$v)."</li>";
 							}