Skip to content

Commit f7b05ea

Browse files
author
Bohdan Berezhniy
committed
corrections for use default value [tag]
1 parent 655211d commit f7b05ea

File tree

3 files changed

+39
-26
lines changed

3 files changed

+39
-26
lines changed

Model/ResourceModel/Tag.php

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,21 @@ protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
4848
*/
4949
protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
5050
{
51-
$object->setTitle(
52-
trim(($object->getTitle()))
53-
);
54-
55-
$tag = $object->getCollection()
56-
->addFieldToFilter('title', $object->getTitle())
57-
->addFieldToFilter('tag_id', ['neq' => $object->getId()])
58-
->setPageSize(1)
59-
->getFirstItem();
60-
if ($tag->getId()) {
61-
throw new \Magento\Framework\Exception\LocalizedException(
62-
__('The tag is already exist.')
51+
if ($object->getTitle()) {
52+
$object->setTitle(
53+
trim(($object->getTitle()))
6354
);
55+
56+
$tag = $object->getCollection()
57+
->addFieldToFilter('title', $object->getTitle())
58+
->addFieldToFilter('tag_id', ['neq' => $object->getId()])
59+
->setPageSize(1)
60+
->getFirstItem();
61+
if ($tag->getId()) {
62+
throw new \Magento\Framework\Exception\LocalizedException(
63+
__('The tag is already exist.')
64+
);
65+
}
6466
}
6567

6668
$identifierGenerator = \Magento\Framework\App\ObjectManager::getInstance()
@@ -180,7 +182,7 @@ public function checkIdentifier($identifier, $storeIds)
180182
$select = $this->_getLoadByIdentifierSelect($identifier, $storeIds);
181183
$select->reset(\Zend_Db_Select::COLUMNS)->columns(['cp.tag_id', 'cp.identifier'])->order('cps.store_id DESC')->limit(1);
182184

183-
185+
184186

185187
$row = $this->getConnection()->fetchRow($select);
186188
if (isset($row['tag_id']) && isset($row['identifier'])

Model/ResourceModel/Tag/Collection.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@
1313
*/
1414
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1515
{
16+
/**
17+
* @inheritDoc
18+
*/
19+
protected $_eventPrefix = 'mfblog_tag_collection';
20+
21+
/**
22+
* @inheritDoc
23+
*/
24+
protected $_eventObject = 'blog_tag_collection';
25+
1626
/**
1727
* @inheritDoc
1828
*/

view/adminhtml/ui_component/blog_tag_form.xml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,21 @@
9696
</item>
9797
</argument>
9898
</field>
99+
<field name="content">
100+
<argument name="data" xsi:type="array">
101+
<item name="config" xsi:type="array">
102+
<item name="label" xsi:type="string"/>
103+
<item name="formElement" xsi:type="string">wysiwyg</item>
104+
<item name="source" xsi:type="string">tag</item>
105+
<item name="wysiwyg" xsi:type="boolean">true</item>
106+
<item name="dataScope" xsi:type="string">content</item>
107+
<item name="additionalClasses" xsi:type="string">admin__field-wide</item>
108+
<item name="sortOrder" xsi:type="number">30</item>
109+
<item name="template" xsi:type="string">ui/form/field</item>
110+
</item>
111+
</argument>
112+
</field>
99113
</fieldset>
100-
<field name="content">
101-
<argument name="data" xsi:type="array">
102-
<item name="config" xsi:type="array">
103-
<item name="label" xsi:type="string"/>
104-
<item name="formElement" xsi:type="string">wysiwyg</item>
105-
<item name="source" xsi:type="string">tag</item>
106-
<item name="wysiwyg" xsi:type="boolean">true</item>
107-
<item name="dataScope" xsi:type="string">content</item>
108-
<item name="additionalClasses" xsi:type="string">admin__field-wide</item>
109-
<item name="sortOrder" xsi:type="number">30</item>
110-
</item>
111-
</argument>
112-
</field>
113114
<fieldset name="display_settings">
114115
<argument name="data" xsi:type="array">
115116
<item name="config" xsi:type="array">

0 commit comments

Comments
 (0)