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

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

Browse Source 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Factorized ModelCriterialTools calls in loops

Conflicts:
	templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
	templates/admin/default/assets/css/admin.less
This commit is contained in:
gmorel
2013-08-30 15:43:43 +02:00
parent fd63115c97 cce270fdcc
commit 180302e7cc
23 changed files with 646 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ class CategoryController extends BaseAdminController
$categoryDeletionForm = new CategoryDeletionForm($this->getRequest());
$data = $this->validateForm($categoryDeletionForm, "POST")->getData();
var_dump($data);
$categoryDeleteEvent = new CategoryDeleteEvent($data['category_id']);
$this->dispatch(TheliaEvents::CATEGORY_DELETE, $categoryDeleteEvent);
@@ -151,8 +151,8 @@ var_dump($data);
protected function positionDown($args)
{
$event = new CategoryChangePositionEvent(
$this->getRequest()->get('category_id', 0),
CategoryChangePositionEvent::POSITION_DOWN
$this->getRequest()->get('category_id', 0),
CategoryChangePositionEvent::POSITION_DOWN
);
$this->dispatch(TheliaEvents::CATEGORY_CHANGE_POSITION, $event);