Pour tout problème contactez-nous par mail : support@froggit.fr | La FAQ :grey_question: | Rejoignez-nous sur le Chat :speech_balloon:

Skip to content
Snippets Groups Projects
Commit ee2310bc authored by Nicolas's avatar Nicolas
Browse files

Développement du module

parent ae3a6d50
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 25 additions and 36 deletions
Block/Adminhtml/ImageSlider/Widget/Chooser.php
+ 1
− 1
View file @ ee2310bc
......@@ -151,7 +151,7 @@ class Chooser extends Extended
{
$this->addColumn(
'chooser_id',
['header' => __('ID'), 'align' => 'right', 'index' => 'image_id', 'width' => 50]
['header' => __('ID'), 'align' => 'right', 'index' => 'entity_id', 'width' => 50]
);
$this->addColumn(
......
Controller/Adminhtml/ImageSlider/Edit.php
+ 2
− 2
View file @ ee2310bc
......@@ -66,7 +66,7 @@ class Edit extends ImageSlider
}
$this->coreRegistry->register('nicolasbejean_imageslidermanager_imageslider', $model);
// 5. Build edit form
/** @var Page $resultPage */
$resultPage = $this->resultPageFactory->create();
......@@ -75,7 +75,7 @@ class Edit extends ImageSlider
$id ? __('Edit Image Slider') : __('New Image Slider')
);
$resultPage->getConfig()->getTitle()->prepend(__('Image Slider'));
$resultPage->getConfig()->getTitle()->prepend($model->getId() ? $model->getName() : __('New Image Slider'));
$resultPage->getConfig()->getTitle()->prepend($model->getId() ? $model->getName() . ' (' . $model->getIdentifier() . ')' : __('New Image Slider'));
return $resultPage;
}
}
Controller/Adminhtml/ImageSlider/Save.php
+ 4
− 16
View file @ ee2310bc
......@@ -73,8 +73,9 @@ class Save extends ImageSliderController
$resultRedirect = $this->resultRedirectFactory->create();
$data = $this->getRequest()->getPostValue();
if ($data) {
if (isset($data['enabled']) && $data['enabled'] === 'true') {
$data['enabled'] = Image::STATUS_ENABLED;
if (isset($data['is_active']) && $data['is_active'] === 'true') {
$data['is_active'] = ImageSlider::STATUS_ENABLED;
}
if (empty($data['entity_id'])) {
$data['entity_id'] = null;
......@@ -93,8 +94,6 @@ class Save extends ImageSliderController
}
}
$data = $this->filterImageSliderData($data);
$model->setData($data);
try {
......@@ -112,17 +111,6 @@ class Save extends ImageSliderController
return $resultRedirect->setPath('*/*/');
}
public function filterImageSliderData(array $rawData)
{
$data = $rawData;
if (isset($data['identifier'][0]['name'])) {
$data['identifier'] = $data['identifier'][0]['name'];
} else {
$data['identifier'] = null;
}
return $data;
}
/**
* Process and set the image slider return
*
......@@ -140,7 +128,7 @@ class Save extends ImageSliderController
} elseif ($redirect === 'close') {
$resultRedirect->setPath('*/*/');
} elseif ($redirect === 'duplicate') {
$duplicateModel = $this->imageFactory->create(['data' => $data]);
$duplicateModel = $this->imageSliderFactory->create(['data' => $data]);
$duplicateModel->setId(null);
$duplicateModel->setIdentifier($data['identifier'] . '-' . uniqid());
$duplicateModel->setName($data['name']);
......
Model/ImageSlider/DataProvider.php
+ 1
− 1
View file @ ee2310bc
......@@ -74,7 +74,7 @@ class DataProvider extends AbstractDataProvider
foreach ($items as $imageSlider) {
$this->loadedData[$imageSlider->getId()] = $imageSlider->getData();
if ($imageSlider->getIdentifier()) {
$m['identifier'][0]['name'] = $imageSlider->getIdentifier();
$m['identifier'] = $imageSlider->getIdentifier();
$fullData = $this->loadedData;
$this->loadedData[$imageSlider->getId()] = array_merge($fullData[$imageSlider->getId()], $m);
}
......
Model/ImageSliderRepository.php
+ 6
− 5
View file @ ee2310bc
......@@ -9,7 +9,7 @@ use \NicolasBejean\ImageSliderManager\Api\Data\ImageSliderInterfaceFactory;
use \NicolasBejean\ImageSliderManager\Api\Data\ImageSliderSearchResultsInterface;
use \NicolasBejean\ImageSliderManager\Api\ImageSliderRepositoryInterface;
use \NicolasBejean\ImageSliderManager\Api\Data;
use \NicolasBejean\ImageSliderManager\Model\ResourceModel\ImageSlider as ResourceImageSlider;
use \NicolasBejean\ImageSliderManager\Model\ResourceModel\ImageSlider as Resource;
use \NicolasBejean\ImageSliderManager\Model\ResourceModel\ImageSlider\Collection;
use \NicolasBejean\ImageSliderManager\Model\ResourceModel\ImageSlider\CollectionFactory as ImageSliderCollectionFactory;
use \Magento\Framework\Api\DataObjectHelper;
......@@ -33,7 +33,7 @@ use \Exception;
class ImageSliderRepository implements ImageSliderRepositoryInterface
{
/**
* @var ResourceImageSlider
* @var Resource
*/
protected $resource;
......@@ -78,7 +78,7 @@ class ImageSliderRepository implements ImageSliderRepositoryInterface
private $collectionProcessor;
/**
* @param ResourceImageSlider $resourceSlider
* @param Resource $resource
* @param ImageSliderFactory $imageSliderFactory
* @param ImageSliderInterfaceFactory $dataImageSliderFactory
* @param ImageSliderCollectionFactory $imageSliderCollectionFactory
......@@ -89,7 +89,7 @@ class ImageSliderRepository implements ImageSliderRepositoryInterface
* @param CollectionProcessorInterface $collectionProcessor
*/
public function __construct(
ResourceImageSlider $resourceSlider,
Resource $resource,
ImageSliderFactory $imageSliderFactory,
ImageSliderInterfaceFactory $dataImageSliderFactory,
ImageSliderCollectionFactory $imageSliderCollectionFactory,
......@@ -99,7 +99,7 @@ class ImageSliderRepository implements ImageSliderRepositoryInterface
StoreManagerInterface $storeManager,
CollectionProcessorInterface $collectionProcessor = null
) {
$this->resourceSlider = $resourceSlider;
$this->resource = $resource;
$this->imageSliderFactory = $imageSliderFactory;
$this->imageSliderCollectionFactory = $imageSliderCollectionFactory;
$this->searchResultsFactory = $searchResultsFactory;
......@@ -142,6 +142,7 @@ class ImageSliderRepository implements ImageSliderRepositoryInterface
*/
public function getById($id)
{
/** @var ImageSlider $imageSlider */
$imageSlider = $this->imageSliderFactory->create();
$this->resource->load($imageSlider, $id);
if (!$imageSlider->getId()) {
......
Ui/Component/Listing/Column/ImageSliderManager/Options.php
+ 1
− 1
View file @ ee2310bc
<?php
namespace NicolasBejean\ImageSliderManager\Ui\Component\Listing\Column\MediaManager;
namespace NicolasBejean\ImageSliderManager\Ui\Component\Listing\Column\ImageSliderManager;
use \Magento\Store\Ui\Component\Listing\Column\Store\Options as StoreOptions;
......
view/adminhtml/ui_component/imageslidermanager_imageslider_form.xml
+ 10
− 10
View file @ ee2310bc
......@@ -26,7 +26,7 @@
</item>
</argument>
<settings>
<submitUrl path="imageslidermanager/imageslider/save"/>
<submitUrl path="nicolasbejeanimageslidermanager/imageslider/save"/>
</settings>
<dataProvider class="NicolasBejean\ImageSliderManager\Model\ImageSlider\DataProvider" name="imageslider_form_data_source">
<settings>
......@@ -51,7 +51,7 @@
<dataScope>entity_id</dataScope>
</settings>
</field>
<field name="enabled" sortOrder="10" formElement="checkbox">
<field name="is_active" sortOrder="10" formElement="checkbox">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="source" xsi:type="string">imageslider</item>
......@@ -61,7 +61,7 @@
<settings>
<dataType>boolean</dataType>
<label translate="true">Enable Image Slider</label>
<dataScope>enabled</dataScope>
<dataScope>is_active</dataScope>
</settings>
<formElements>
<checkbox>
......@@ -75,7 +75,7 @@
</checkbox>
</formElements>
</field>
<field name="identifier" sortOrder="30" formElement="input">
<field name="identifier" sortOrder="20" formElement="input">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="source" xsi:type="string">imageslider</item>
......@@ -87,16 +87,16 @@
</validation>
<dataType>text</dataType>
<label translate="true">Identifier</label>
<dataScope>alt</dataScope>
<dataScope>identifier</dataScope>
</settings>
</field>
</fieldset>
<fieldset name="content" sortOrder="10">
<settings>
<collapsible>true</collapsible>
<label translate="true">Content</label>
<label translate="true">Slider Content</label>
</settings>
<field name="name" sortOrder="30" formElement="input">
<field name="name" sortOrder="10" formElement="input">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="source" xsi:type="string">imageslider</item>
......@@ -108,10 +108,10 @@
</validation>
<dataType>text</dataType>
<label translate="true">Name</label>
<dataScope>alt</dataScope>
<dataScope>name</dataScope>
</settings>
</field>
<field name="content" sortOrder="30" formElement="input">
<field name="content" sortOrder="20" formElement="input">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="source" xsi:type="string">imageslider</item>
......@@ -123,7 +123,7 @@
</validation>
<dataType>text</dataType>
<label translate="true">Content</label>
<dataScope>alt</dataScope>
<dataScope>content</dataScope>
</settings>
</field>
</fieldset>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Froggit est fièrement fabriqué avec amour par Lydra avec des Logiciels Libres et hébergé en France chez Scaleway | Status du service