TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix missing id in folder-edit.html template

Browse Source
This commit is contained in:
Manuel Raynaud
2013-12-16 17:06:15 +01:00
parent 10ecec2fa1
commit 1a0d543990
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/lib/Thelia/Controller/Admin/FolderController.php
View File

@@ -22,6 +22,7 @@
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\Controller\Admin; namespace Thelia\Controller\Admin;
use Thelia\Core\HttpFoundation\Request;
use Thelia\Core\Security\Resource\AdminResources; use Thelia\Core\Security\Resource\AdminResources;
use Thelia\Core\Event\Folder\FolderCreateEvent; use Thelia\Core\Event\Folder\FolderCreateEvent;
use Thelia\Core\Event\Folder\FolderDeleteEvent; use Thelia\Core\Event\Folder\FolderDeleteEvent;
@@ -249,11 +250,15 @@ class FolderController extends AbstractSeoCrudController
return $this->render('folder-edit', $this->getEditionArguments()); return $this->render('folder-edit', $this->getEditionArguments());
} }
protected function getEditionArguments() protected function getEditionArguments(Request $request = null)
{ {
if (null === $request) {
$request = $this->getRequest();
}
return array( return array(
'folder_id' => $this->getRequest()->get('folder_id', 0), 'folder_id' => $request->get('folder_id', 0),
'current_tab' => $this->getRequest()->get('current_tab', 'general') 'current_tab' => $request->get('current_tab', 'general')
); );
} }
@@ -311,9 +316,9 @@ class FolderController extends AbstractSeoCrudController
/** /**
* Redirect to the edition template * Redirect to the edition template
*/ */
protected function redirectToEditionTemplate() protected function redirectToEditionTemplate(Request $request = null)
{ {
$this->redirect($this->getRoute('admin.folders.update', $this->getEditionArguments())); $this->redirect($this->getRoute('admin.folders.update', $this->getEditionArguments($request)));
} }
/** /**

1
templates/backOffice/default/folder-edit.html
View File

@@ -125,6 +125,7 @@
form = $form form = $form
formAction = "{url path='/admin/folders/seo/save'}" formAction = "{url path='/admin/folders/seo/save'}"
closeUrl = $close_url closeUrl = $close_url
current_id = $folder_id
} }
{/form} {/form}
</div> </div>