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

fix saves & close action on document and images. Fix #402

Browse Source
This commit is contained in:
Manuel Raynaud
2014-05-30 11:49:03 +02:00
parent 08ec1140aa
commit 8370158f9d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/lib/Thelia/Controller/Admin/FileController.php
View File

@@ -35,6 +35,7 @@ use Thelia\Model\ProductDocument;
use Thelia\Model\ProductImage; use Thelia\Model\ProductImage;
use Thelia\Tools\FileManager; use Thelia\Tools\FileManager;
use Thelia\Tools\Rest\ResponseRest; use Thelia\Tools\Rest\ResponseRest;
use Thelia\Tools\URL;
/** /**
* Created by JetBrains PhpStorm. * Created by JetBrains PhpStorm.
@@ -389,7 +390,7 @@ class FileController extends BaseAdminController
$this->adminLogAppend(AdminResources::retrieve($parentType), AccessManager::UPDATE, sprintf('Image with Ref %s (ID %d) modified', $imageUpdated->getTitle(), $imageUpdated->getId())); $this->adminLogAppend(AdminResources::retrieve($parentType), AccessManager::UPDATE, sprintf('Image with Ref %s (ID %d) modified', $imageUpdated->getTitle(), $imageUpdated->getId()));
if ($this->getRequest()->get('save_mode') == 'close') { if ($this->getRequest()->get('save_mode') == 'close') {
$this->redirectToRoute('admin.images'); $this->redirect(URL::getInstance()->absoluteUrl($fileManager->getRedirectionUrl($parentType, $image->getParentId(), FileManager::FILE_TYPE_IMAGES)));
} else { } else {
$this->redirectSuccess($imageModification); $this->redirectSuccess($imageModification);
} }
@@ -466,7 +467,7 @@ class FileController extends BaseAdminController
$this->adminLogAppend(AdminResources::retrieve($parentType), AccessManager::UPDATE, sprintf('Document with Ref %s (ID %d) modified', $documentUpdated->getTitle(), $documentUpdated->getId())); $this->adminLogAppend(AdminResources::retrieve($parentType), AccessManager::UPDATE, sprintf('Document with Ref %s (ID %d) modified', $documentUpdated->getTitle(), $documentUpdated->getId()));
if ($this->getRequest()->get('save_mode') == 'close') { if ($this->getRequest()->get('save_mode') == 'close') {
$this->redirectToRoute('admin.documents'); $this->redirect(URL::getInstance()->absoluteUrl($fileManager->getRedirectionUrl($parentType, $document->getParentId(), FileManager::FILE_TYPE_DOCUMENTS)));
} else { } else {
$this->redirectSuccess($documentModification); $this->redirectSuccess($documentModification);
} }

2
templates/backOffice/default/document-edit.html
View File

@@ -34,7 +34,7 @@
hide_submit_buttons = false hide_submit_buttons = false
page_url = "{url path="/admin/document/type/{$documentType}/{$ID}/update"}" page_url = "{url path="/admin/document/type/{$documentType}/{$ID}/update"}"
close_url = "{url path="{$redirectUrl}"}" close_url = "{url path="{$redirectUrl}" noamp=1}"
} }
{form_hidden_fields form=$form} {form_hidden_fields form=$form}

2
templates/backOffice/default/image-edit.html
View File

@@ -34,7 +34,7 @@
hide_submit_buttons = false hide_submit_buttons = false
page_url = "{url path="/admin/image/type/{$imageType}/{$ID}/update"}" page_url = "{url path="/admin/image/type/{$imageType}/{$ID}/update"}"
close_url = "{url path="{$redirectUrl}"}" close_url = "{url path="{$redirectUrl}" noamp=1}"
} }
{form_hidden_fields form=$form} {form_hidden_fields form=$form}