Skip to content

Commit

Permalink
Merge pull request #89 from mageplaza/2.4-develop
Browse files Browse the repository at this point in the history
2.4 develop
  • Loading branch information
haitv282 authored Jun 14, 2022
2 parents 40045f9 + 2871cdc commit 160753a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 27 deletions.
1 change: 1 addition & 0 deletions Block/Adminhtml/Slider/Edit/Tab/Banner.php
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ protected function _prepareColumns()
'validate_class' => 'validate-number validate-zero-or-greater validate-digits',
'index' => 'position',
'editable' => true,
'edit_only' => true,
]);

return $this;
Expand Down
3 changes: 2 additions & 1 deletion Block/Adminhtml/Slider/Edit/Tab/Design.php
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ protected function _prepareForm()
$timeout = $fieldset->addField('autoplayTimeout', 'text', [
'name' => 'autoplayTimeout',
'label' => __('Autoplay Time-Out'),
'title' => __('Autoplay Time-Out')
'title' => __('Autoplay Time-Out'),
'class' => 'validate-number validate-zero-or-greater validate-digits',
]);

$dependencies = $this->getLayout()->createBlock(Dependence::class)
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "mageplaza/module-banner-slider",
"description": "Magento 2 Banner Slider extension",
"require": {
"mageplaza/module-core": "^1.4.5"
"mageplaza/module-core": "^1.4.12"
},
"type": "magento2-module",
"version": "4.0.2",
"version": "4.0.3",
"license": "proprietary",
"authors": [
{
Expand Down
48 changes: 24 additions & 24 deletions view/adminhtml/web/template/grid/cells/html.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<!--
/**
* Mageplaza
*
* NOTICE OF LICENSE
*
* This source file is subject to the Mageplaza.com license that is
* available through the world-wide-web at this URL:
* https://www.mageplaza.com/LICENSE.txt
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade this extension to newer
* version in the future.
*
* @category Mageplaza
* @package Mageplaza_BannerSlider
* @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/)
* @license https://www.mageplaza.com/LICENSE.txt
*/
-->

<div class="data-grid-cell-content" html="$col.getLabel($row())" if="getType($row())"/>
<img class="admin__control-thumbnail" attr="src: $col.getSrc($row()), alt: $col.getAlt($row())" ifnot="getType($row())"/>
<!--
/**
* Mageplaza
*
* NOTICE OF LICENSE
*
* This source file is subject to the Mageplaza.com license that is
* available through the world-wide-web at this URL:
* https://www.mageplaza.com/LICENSE.txt
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade this extension to newer
* version in the future.
*
* @category Mageplaza
* @package Mageplaza_BannerSlider
* @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/)
* @license https://www.mageplaza.com/LICENSE.txt
*/
-->

<div class="data-grid-cell-content" html="$col.getLabel($row())" if="getType($row())"></div>
<img class="admin__control-thumbnail" attr="src: $col.getSrc($row()), alt: $col.getAlt($row())" ifnot="getType($row())"/>

0 comments on commit 160753a

Please sign in to comment.