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

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source 
Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php
This commit is contained in:
franck
2013-09-18 00:35:48 +02:00
parent de4767ef56 c659bc0e66
commit d02f13f021
45 changed files with 887 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Thelia/Controller/Admin/ProductController.php
View File

@@ -250,7 +250,7 @@ class ProductController extends AbstractCrudController
// Redirect to parent product list
$this->redirectToRoute(
'admin.products.default',
array('category_id' => $deleteEvent->getProduct()->getDefaultCategoryId())
array('category_id' => $this->getCategoryId())
);
}
@@ -261,7 +261,7 @@ class ProductController extends AbstractCrudController
// Redirect to parent product list
$this->redirectToRoute(
'admin.categories.default',
array('category_id' => $updateEvent->getProduct()->getDefaultCategoryId())
array('category_id' => $this->getCategoryId())
);
}
}
@@ -271,7 +271,7 @@ class ProductController extends AbstractCrudController
// Redirect to parent product list
$this->redirectToRoute(
'admin.categories.default',
array('category_id' => $positionEvent->getProduct()->getDefaultCategoryId())
array('category_id' => $this->getCategoryId())
);
}