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

images are positionable

Browse Source
This commit is contained in:
Etienne Roudeix
2013-12-12 15:41:35 +01:00
parent 93537b8d71
commit c9e052188c
7 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Action/Image.php
View File

@@ -305,8 +305,6 @@ class Image extends BaseCachedFile implements EventSubscriberInterface
public function updatePosition(UpdateImagePositionEvent $event) public function updatePosition(UpdateImagePositionEvent $event)
{ {
return $this->genericUpdatePosition($event->getQuery(), $event); return $this->genericUpdatePosition($event->getQuery(), $event);
$out = true;
} }
/** /**

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

@@ -25,7 +25,7 @@ namespace Thelia\Controller\Admin;
use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Exception\PropelException;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
use Thelia\Core\Event\UpdatePositionEvent; use Thelia\Core\Event\UpdateImagePositionEvent;
use Thelia\Core\HttpFoundation\Response; use Thelia\Core\HttpFoundation\Response;
use Thelia\Core\Security\Resource\AdminResources; use Thelia\Core\Security\Resource\AdminResources;
use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent; use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent;
@@ -615,9 +615,10 @@ class FileController extends BaseAdminController
} }
// Feed event // Feed event
$imageUpdatePositionEvent = new UpdatePositionEvent( $imageUpdateImagePositionEvent = new UpdateImagePositionEvent(
$fileManager->getImageModelQuery($parentType),
$imageId, $imageId,
UpdatePositionEvent::POSITION_ABSOLUTE, UpdateImagePositionEvent::POSITION_ABSOLUTE,
$position $position
); );
@@ -625,7 +626,7 @@ class FileController extends BaseAdminController
try { try {
$this->dispatch( $this->dispatch(
TheliaEvents::IMAGE_UPDATE_POSITION, TheliaEvents::IMAGE_UPDATE_POSITION,
$imageUpdatePositionEvent $imageUpdateImagePositionEvent
); );
} catch (\Exception $e) { } catch (\Exception $e) {

1
core/lib/Thelia/Model/CategoryImage.php
View File

@@ -9,6 +9,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
class CategoryImage extends BaseCategoryImage class CategoryImage extends BaseCategoryImage
{ {
use \Thelia\Model\Tools\ModelEventDispatcherTrait;
use \Thelia\Model\Tools\PositionManagementTrait; use \Thelia\Model\Tools\PositionManagementTrait;
/** /**

1
core/lib/Thelia/Model/ContentImage.php
View File

@@ -7,6 +7,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
class ContentImage extends BaseContentImage class ContentImage extends BaseContentImage
{ {
use \Thelia\Model\Tools\ModelEventDispatcherTrait;
use \Thelia\Model\Tools\PositionManagementTrait; use \Thelia\Model\Tools\PositionManagementTrait;
/** /**

1
core/lib/Thelia/Model/FolderImage.php
View File

@@ -7,6 +7,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
class FolderImage extends BaseFolderImage class FolderImage extends BaseFolderImage
{ {
use \Thelia\Model\Tools\ModelEventDispatcherTrait;
use \Thelia\Model\Tools\PositionManagementTrait; use \Thelia\Model\Tools\PositionManagementTrait;
/** /**

1
core/lib/Thelia/Model/ProductImage.php
View File

@@ -7,6 +7,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
class ProductImage extends BaseProductImage class ProductImage extends BaseProductImage
{ {
use \Thelia\Model\Tools\ModelEventDispatcherTrait;
use \Thelia\Model\Tools\PositionManagementTrait; use \Thelia\Model\Tools\PositionManagementTrait;
/** /**

2
templates/backOffice/default/assets/js/image-upload.js
View File

@@ -126,8 +126,6 @@ $(function($){
}); });
}, },
stop: function( event, ui ) { stop: function( event, ui ) {
event.preventDefault();
/* update */ /* update */
var newPosition = ui.item.find('.js-sorted-position').html(); var newPosition = ui.item.find('.js-sorted-position').html();
var imageId = ui.item.data('sort-id'); var imageId = ui.item.data('sort-id');