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

Merge branch 'refactor_action'

Browse Source 
Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php
This commit is contained in:
Manuel Raynaud
2013-09-30 10:26:59 +02:00
parent 2928d0d3c0 6c5e348b46
commit 7bf5ee31c9
116 changed files with 334 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Action/Attribute.php
View File

@@ -30,15 +30,15 @@ use Thelia\Model\Attribute as AttributeModel;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Event\AttributeUpdateEvent;
use Thelia\Core\Event\AttributeCreateEvent;
use Thelia\Core\Event\AttributeDeleteEvent;
use Thelia\Core\Event\Attribute\AttributeUpdateEvent;
use Thelia\Core\Event\Attribute\AttributeCreateEvent;
use Thelia\Core\Event\Attribute\AttributeDeleteEvent;
use Thelia\Model\ConfigQuery;
use Thelia\Model\AttributeAv;
use Thelia\Model\AttributeAvQuery;
use Thelia\Core\Event\UpdatePositionEvent;
use Thelia\Core\Event\CategoryEvent;
use Thelia\Core\Event\AttributeEvent;
use Thelia\Core\Event\Category\CategoryEvent;
use Thelia\Core\Event\Attribute\AttributeEvent;
use Thelia\Model\AttributeTemplate;
use Thelia\Model\AttributeTemplateQuery;
use Thelia\Model\TemplateQuery;