From 2bd23777caee70f5b288e91308e4fcfc0a00cb62 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Mon, 20 Jan 2014 14:52:44 +0100
Subject: [PATCH] "save and close" button had now effect. Fix #185

---
 core/lib/Thelia/Controller/Admin/ConfigStoreController.php | 7 ++++++-
 templates/backOffice/default/config-store.html             | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Controller/Admin/ConfigStoreController.php b/core/lib/Thelia/Controller/Admin/ConfigStoreController.php
index 95d425edb..ff339ded9 100644
--- a/core/lib/Thelia/Controller/Admin/ConfigStoreController.php
+++ b/core/lib/Thelia/Controller/Admin/ConfigStoreController.php
@@ -85,7 +85,12 @@ class ConfigStoreController extends BaseAdminController
 
             $this->adminLogAppend(AdminResources::STORE, AccessManager::UPDATE, "Store configuration changed");
 
-            $this->redirectToRoute('admin.configuration.store.default');
+            if ($this->getRequest()->get('save_mode') == 'stay') {
+                $this->redirectToRoute('admin.configuration.store.default');
+            }
+
+            // Redirect to the success URL
+            $this->redirect($configStoreForm->getSuccessUrl());
 
         } catch (\Exception $ex) {
             $error_msg = $ex->getMessage();
diff --git a/templates/backOffice/default/config-store.html b/templates/backOffice/default/config-store.html
index c9522a562..f6f300ddb 100755
--- a/templates/backOffice/default/config-store.html
+++ b/templates/backOffice/default/config-store.html
@@ -32,6 +32,9 @@
 	 						<form method="POST" action="{url path='/admin/configuration/store/save'}">
                                 {form_hidden_fields form=$form}
 
+                                {form_field form=$form field='success_url'}
+                                    <input type="hidden" name="{$name}" value="{url path='/admin/configuration'}">
+                                {/form_field}
                                 {include
                                     file = "includes/inner-form-toolbar.html"
                                     hide_flags = true