diff --git a/core/lib/Thelia/Action/Image.php b/core/lib/Thelia/Action/Image.php index 83bf3b774..56e9413b1 100755 --- a/core/lib/Thelia/Action/Image.php +++ b/core/lib/Thelia/Action/Image.php @@ -305,8 +305,6 @@ class Image extends BaseCachedFile implements EventSubscriberInterface public function updatePosition(UpdateImagePositionEvent $event) { return $this->genericUpdatePosition($event->getQuery(), $event); - - $out = true; } /** diff --git a/core/lib/Thelia/Controller/Admin/FileController.php b/core/lib/Thelia/Controller/Admin/FileController.php index cc32ef93d..ba9daf5d3 100755 --- a/core/lib/Thelia/Controller/Admin/FileController.php +++ b/core/lib/Thelia/Controller/Admin/FileController.php @@ -25,7 +25,7 @@ namespace Thelia\Controller\Admin; use Propel\Runtime\Exception\PropelException; use Symfony\Component\HttpFoundation\File\UploadedFile; -use Thelia\Core\Event\UpdatePositionEvent; +use Thelia\Core\Event\UpdateImagePositionEvent; use Thelia\Core\HttpFoundation\Response; use Thelia\Core\Security\Resource\AdminResources; use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent; @@ -615,9 +615,10 @@ class FileController extends BaseAdminController } // Feed event - $imageUpdatePositionEvent = new UpdatePositionEvent( + $imageUpdateImagePositionEvent = new UpdateImagePositionEvent( + $fileManager->getImageModelQuery($parentType), $imageId, - UpdatePositionEvent::POSITION_ABSOLUTE, + UpdateImagePositionEvent::POSITION_ABSOLUTE, $position ); @@ -625,7 +626,7 @@ class FileController extends BaseAdminController try { $this->dispatch( TheliaEvents::IMAGE_UPDATE_POSITION, - $imageUpdatePositionEvent + $imageUpdateImagePositionEvent ); } catch (\Exception $e) { diff --git a/core/lib/Thelia/Model/CategoryImage.php b/core/lib/Thelia/Model/CategoryImage.php index b1f0ff4a9..378350bf1 100755 --- a/core/lib/Thelia/Model/CategoryImage.php +++ b/core/lib/Thelia/Model/CategoryImage.php @@ -9,6 +9,7 @@ use Propel\Runtime\Connection\ConnectionInterface; class CategoryImage extends BaseCategoryImage { + use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; /** diff --git a/core/lib/Thelia/Model/ContentImage.php b/core/lib/Thelia/Model/ContentImage.php index e26f6f6af..410f48ff8 100755 --- a/core/lib/Thelia/Model/ContentImage.php +++ b/core/lib/Thelia/Model/ContentImage.php @@ -7,6 +7,7 @@ use Propel\Runtime\Connection\ConnectionInterface; class ContentImage extends BaseContentImage { + use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; /** diff --git a/core/lib/Thelia/Model/FolderImage.php b/core/lib/Thelia/Model/FolderImage.php index 725faf744..32b9180ed 100755 --- a/core/lib/Thelia/Model/FolderImage.php +++ b/core/lib/Thelia/Model/FolderImage.php @@ -7,6 +7,7 @@ use Propel\Runtime\Connection\ConnectionInterface; class FolderImage extends BaseFolderImage { + use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; /** diff --git a/core/lib/Thelia/Model/ProductImage.php b/core/lib/Thelia/Model/ProductImage.php index 32026bdd3..0215b3f21 100755 --- a/core/lib/Thelia/Model/ProductImage.php +++ b/core/lib/Thelia/Model/ProductImage.php @@ -7,6 +7,7 @@ use Propel\Runtime\Connection\ConnectionInterface; class ProductImage extends BaseProductImage { + use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; /** diff --git a/templates/backOffice/default/assets/js/image-upload.js b/templates/backOffice/default/assets/js/image-upload.js index c4509c09e..53afacd34 100755 --- a/templates/backOffice/default/assets/js/image-upload.js +++ b/templates/backOffice/default/assets/js/image-upload.js @@ -126,8 +126,6 @@ $(function($){ }); }, stop: function( event, ui ) { - event.preventDefault(); - /* update */ var newPosition = ui.item.find('.js-sorted-position').html(); var imageId = ui.item.data('sort-id');