Commit f61b022c authored by Hendrik Rombach's avatar Hendrik Rombach
Browse files

Merge branch '29241' into '1.3'

#29241 - Optimized delete protection

See merge request shopware/labs/NetiTags!14
parents cbfb76af 9a3aa9fb
......@@ -25,7 +25,7 @@ class Shopware_Controllers_Backend_NetiTags extends AbstractBackendExtJsControll
$this->View()->loadTemplate('backend/neti_tags/app.js');
$this->View()->assign('neti_tags_plugin_config', array(
'deleteprotecting' => $this->getPluginConfig()->isDeleteprotecting()
'deleteprotecting' => $this->getPluginConfig()->isDeletionProtected()
));
}
......
......@@ -26,7 +26,7 @@ class PluginConfig extends AbstractClass
*
* @return bool
*/
public function isDeleteprotecting()
public function isDeletionProtected()
{
return $this->deleteprotecting;
}
......
......@@ -91,7 +91,7 @@ class TagsSubscriber implements SubscriberInterface
$tag = $args->get('tag');
if (
true !== $this->getConfig()->isDeletprotecting()
true !== $this->getConfig()->isDeletionProtected()
|| 0 === $tag->getRelations()->count()
) {
return;
......
......@@ -14,9 +14,11 @@
<changes lang="de"><![CDATA[
[#29235] Übergabe der Tags an Smarty umwandeln
[#29243] Im Backend-Detailview werden nun Name und ID des Tags im Titel angezeigt
[#29241] Löschschutz optimiert
]]></changes>
<changes lang="en"><![CDATA[
[#29235] Convert handover of tags to smarty
[#29241] Optimized delete protection
[#29243] Will now display tag id and name in the backend detail view title
]]></changes>
</changelog>
......
Markdown is supported
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