Fixed gh-748 so that tags are able to be added to the list admin view. Makes the adding of tags dynamic based on tag field in the view.

This commit is contained in:
Llewellyn van der Merwe 2021-05-19 17:44:14 +02:00
parent 0f00ff90ed
commit d5482d65cb
Signed by untrusted user: Llewellyn
GPG Key ID: EFC0C720A240551C
55 changed files with 64 additions and 306 deletions

View File

@ -143,11 +143,11 @@ TODO
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 17th May, 2021 + *Last Build*: 19th May, 2021
+ *Version*: 2.12.9 + *Version*: 2.12.9
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt + *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **292237** + *Line count*: **291955**
+ *Field count*: **1629** + *Field count*: **1629**
+ *File count*: **1935** + *File count*: **1935**
+ *Folder count*: **322** + *Folder count*: **322**

View File

@ -143,11 +143,11 @@ TODO
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 17th May, 2021 + *Last Build*: 19th May, 2021
+ *Version*: 2.12.9 + *Version*: 2.12.9
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt + *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **292237** + *Line count*: **291955**
+ *Field count*: **1629** + *Field count*: **1629**
+ *File count*: **1935** + *File count*: **1935**
+ *Folder count*: **322** + *Folder count*: **322**

View File

@ -92,12 +92,6 @@ class ###Component###Model###View### extends JModelAdmin
$registry->loadString($item->metadata); $registry->loadString($item->metadata);
$item->metadata = $registry->toArray(); $item->metadata = $registry->toArray();
}###METHOD_GET_ITEM### }###METHOD_GET_ITEM###
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_###component###.###view###');
}
}###LINKEDVIEWGLOBAL### }###LINKEDVIEWGLOBAL###
return $item; return $item;

View File

@ -92,12 +92,6 @@ class ###Component###Model###View### extends JModelAdmin
$registry->loadString($item->metadata); $registry->loadString($item->metadata);
$item->metadata = $registry->toArray(); $item->metadata = $registry->toArray();
}###METHOD_GET_ITEM### }###METHOD_GET_ITEM###
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_###component###.###view###');
}
}###LINKEDVIEWGLOBAL### }###LINKEDVIEWGLOBAL###
return $item; return $item;

View File

@ -4578,6 +4578,12 @@ class Fields extends Structure
$nameListCode, $name, $view, $field, $typeName, $multiple, $nameListCode, $name, $view, $field, $typeName, $multiple,
$custom = false, $options = false $custom = false, $options = false
) { ) {
// check if this is a tag field
if ($typeName === 'tag')
{
// set tags for this view but don't load to DB
$this->tagsBuilder[$nameSingleCode] = $nameSingleCode;
}
// dbSwitch // dbSwitch
$dbSwitch = true; $dbSwitch = true;
if (isset($field['list']) && $field['list'] == 2) if (isset($field['list']) && $field['list'] == 2)
@ -4585,11 +4591,6 @@ class Fields extends Structure
// do not add this field to the database // do not add this field to the database
$dbSwitch = false; $dbSwitch = false;
} }
elseif ($typeName === 'tag')
{
// set tags for this view but don't load to DB
$this->tagsBuilder[$nameSingleCode] = $nameSingleCode;
}
elseif (isset($field['settings']->datatype)) elseif (isset($field['settings']->datatype))
{ {
// insure default not none if number type // insure default not none if number type

View File

@ -7299,6 +7299,8 @@ class Interpretation extends Fields
// get the component name // get the component name
$Component = $this->fileContentStatic[$this->hhh . 'Component' $Component = $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]; . $this->hhh];
$component = $this->fileContentStatic[$this->hhh . 'component'
. $this->hhh];
// go from base64 to string // go from base64 to string
if (isset($this->base64Builder[$view]) if (isset($this->base64Builder[$view])
&& ComponentbuilderHelper::checkArray($this->base64Builder[$view])) && ComponentbuilderHelper::checkArray($this->base64Builder[$view]))
@ -7453,7 +7455,21 @@ class Interpretation extends Fields
$script .= PHP_EOL . $this->_t(3) . "}"; $script .= PHP_EOL . $this->_t(3) . "}";
} }
} }
// add the tag get options
if (isset($this->tagsBuilder[$view]))
{
$script .= PHP_EOL . PHP_EOL . $this->_t(3)
. "if (!empty(\$item->id))";
$script .= PHP_EOL . $this->_t(3) . "{";
$script .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(
__LINE__
) . " Get Tag IDs.";
$script .= PHP_EOL . $this->_t(4) . "\$item->tags"
. " = new JHelperTags;";
$script .= PHP_EOL . $this->_t(4)
. "\$item->tags->getTagIds(\$item->id, 'com_$component.$view');";
$script .= PHP_EOL . $this->_t(3) . "}";
}
// add custom php to getitem method // add custom php to getitem method
$script .= $this->getCustomScriptBuilder( $script .= $this->getCustomScriptBuilder(
'php_getitem', $view, PHP_EOL . PHP_EOL 'php_getitem', $view, PHP_EOL . PHP_EOL
@ -21705,6 +21721,41 @@ class Interpretation extends Fields
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "}" $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "}"
. PHP_EOL; . PHP_EOL;
} }
// add the tags if needed
if (isset($this->tagsBuilder[$nameSingleCode]))
{
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//"
. $this->setLine(
__LINE__
) . " Add the tags";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
. "\$item->tags = new JHelperTags;";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
. "\$item->tags->getTagIds(";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
. "\$item->id, 'com_"
. $this->fileContentStatic[$this->hhh . 'component'
. $this->hhh] . ".$nameSingleCode'";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . ");";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
. "if (\$item->tags->tags)";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "{";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
. "\$item->tags = implode(', ',";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
. "\$item->tags->getTagNames(";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(6)
. "explode(',', \$item->tags->tags)";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5) . ")";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4) . ");";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "}";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
. "else";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "{";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
. "\$item->tags = '';";
$fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "}";
}
// get the correct array // get the correct array
if ($export || $all) if ($export || $all)
{ {

View File

@ -106,12 +106,6 @@ class ComponentbuilderModelAdmin_custom_tabs extends JModelAdmin
$tabs->loadString($item->tabs); $tabs->loadString($item->tabs);
$item->tabs = $tabs->toArray(); $item->tabs = $tabs->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.admin_custom_tabs');
}
} }
return $item; return $item;

View File

@ -127,12 +127,6 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
$fieldsUpdate->addfields = json_encode($bucket); $fieldsUpdate->addfields = json_encode($bucket);
$this->_db->updateObject('#__componentbuilder_admin_fields', $fieldsUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_admin_fields', $fieldsUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.admin_fields');
}
} }
return $item; return $item;

View File

@ -127,12 +127,6 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
$conditionsUpdate->addconditions = json_encode($bucket); $conditionsUpdate->addconditions = json_encode($bucket);
$this->_db->updateObject('#__componentbuilder_admin_fields_conditions', $conditionsUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_admin_fields_conditions', $conditionsUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.admin_fields_conditions');
}
} }
return $item; return $item;

View File

@ -189,12 +189,6 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.admin_fields_relations');
}
} }
return $item; return $item;

View File

@ -665,12 +665,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$item->mysql_table_collate = 'utf8_general_ci'; $item->mysql_table_collate = 'utf8_general_ci';
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.admin_view');
}
} }
return $item; return $item;

View File

@ -196,12 +196,6 @@ class ComponentbuilderModelClass_extends extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.class_extends');
}
} }
return $item; return $item;

View File

@ -205,12 +205,6 @@ class ComponentbuilderModelClass_method extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.class_method');
}
} }
return $item; return $item;

View File

@ -196,12 +196,6 @@ class ComponentbuilderModelClass_property extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.class_property');
}
} }
return $item; return $item;

View File

@ -138,12 +138,6 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_component_admin_views', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_component_admin_views', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_admin_views');
}
} }
return $item; return $item;

View File

@ -137,12 +137,6 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_component_config', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_component_config', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_config');
}
} }
return $item; return $item;

View File

@ -137,12 +137,6 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_component_custom_admin_menus', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_component_custom_admin_menus', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_custom_admin_menus');
}
} }
return $item; return $item;

View File

@ -138,12 +138,6 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_component_custom_admin_views', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_component_custom_admin_views', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_custom_admin_views');
}
} }
return $item; return $item;

View File

@ -226,12 +226,6 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_component_dashboard', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_component_dashboard', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_dashboard');
}
} }
return $item; return $item;

View File

@ -174,12 +174,6 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_component_files_folders', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_component_files_folders', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_files_folders');
}
} }
return $item; return $item;

View File

@ -107,12 +107,6 @@ class ComponentbuilderModelComponent_modules extends JModelAdmin
$addjoomla_modules->loadString($item->addjoomla_modules); $addjoomla_modules->loadString($item->addjoomla_modules);
$item->addjoomla_modules = $addjoomla_modules->toArray(); $item->addjoomla_modules = $addjoomla_modules->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_modules');
}
} }
return $item; return $item;

View File

@ -137,12 +137,6 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_component_mysql_tweaks', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_component_mysql_tweaks', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_mysql_tweaks');
}
} }
return $item; return $item;

View File

@ -106,12 +106,6 @@ class ComponentbuilderModelComponent_placeholders extends JModelAdmin
$addplaceholders->loadString($item->addplaceholders); $addplaceholders->loadString($item->addplaceholders);
$item->addplaceholders = $addplaceholders->toArray(); $item->addplaceholders = $addplaceholders->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_placeholders');
}
} }
return $item; return $item;

View File

@ -107,12 +107,6 @@ class ComponentbuilderModelComponent_plugins extends JModelAdmin
$addjoomla_plugins->loadString($item->addjoomla_plugins); $addjoomla_plugins->loadString($item->addjoomla_plugins);
$item->addjoomla_plugins = $addjoomla_plugins->toArray(); $item->addjoomla_plugins = $addjoomla_plugins->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_plugins');
}
} }
return $item; return $item;

View File

@ -138,12 +138,6 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_component_site_views', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_component_site_views', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_site_views');
}
} }
return $item; return $item;

View File

@ -137,12 +137,6 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_component_updates', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_component_updates', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.component_updates');
}
} }
return $item; return $item;

View File

@ -371,12 +371,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
// be sure to update the table if we found repeatable fields that are still not converted // be sure to update the table if we found repeatable fields that are still not converted
$this->_db->updateObject('#__componentbuilder_custom_admin_view', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_custom_admin_view', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.custom_admin_view');
}
} }
return $item; return $item;

View File

@ -205,12 +205,6 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.custom_code');
}
} }
return $item; return $item;

View File

@ -385,12 +385,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_dynamic_get', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_dynamic_get', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.dynamic_get');
}
} }
return $item; return $item;

View File

@ -284,12 +284,6 @@ class ComponentbuilderModelField extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.field');
}
} }
return $item; return $item;

View File

@ -232,12 +232,6 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
$objectUpdate->properties = json_encode($bucket); $objectUpdate->properties = json_encode($bucket);
$this->db->updateObject('#__componentbuilder_fieldtype', $objectUpdate, 'id'); $this->db->updateObject('#__componentbuilder_fieldtype', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype');
}
} }
$this->fieldtypevvvv = $item->id; $this->fieldtypevvvv = $item->id;

View File

@ -120,12 +120,6 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
// JSON Decode groups. // JSON Decode groups.
$item->groups = json_decode($item->groups,true); $item->groups = json_decode($item->groups,true);
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.help_document');
}
} }
return $item; return $item;

View File

@ -548,12 +548,6 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_joomla_component', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_joomla_component', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_component');
}
} }
return $item; return $item;

View File

@ -377,12 +377,6 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_module');
}
} }
return $item; return $item;

View File

@ -152,12 +152,6 @@ class ComponentbuilderModelJoomla_module_files_folders_urls extends JModelAdmin
$addurls->loadString($item->addurls); $addurls->loadString($item->addurls);
$item->addurls = $addurls->toArray(); $item->addurls = $addurls->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_module_files_folders_urls');
}
} }
return $item; return $item;

View File

@ -106,12 +106,6 @@ class ComponentbuilderModelJoomla_module_updates extends JModelAdmin
$version_update->loadString($item->version_update); $version_update->loadString($item->version_update);
$item->version_update = $version_update->toArray(); $item->version_update = $version_update->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_module_updates');
}
} }
return $item; return $item;

View File

@ -342,12 +342,6 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_plugin');
}
} }
return $item; return $item;

View File

@ -152,12 +152,6 @@ class ComponentbuilderModelJoomla_plugin_files_folders_urls extends JModelAdmin
$addurls->loadString($item->addurls); $addurls->loadString($item->addurls);
$item->addurls = $addurls->toArray(); $item->addurls = $addurls->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_plugin_files_folders_urls');
}
} }
return $item; return $item;

View File

@ -98,12 +98,6 @@ class ComponentbuilderModelJoomla_plugin_group extends JModelAdmin
$registry->loadString($item->metadata); $registry->loadString($item->metadata);
$item->metadata = $registry->toArray(); $item->metadata = $registry->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_plugin_group');
}
} }
return $item; return $item;

View File

@ -106,12 +106,6 @@ class ComponentbuilderModelJoomla_plugin_updates extends JModelAdmin
$version_update->loadString($item->version_update); $version_update->loadString($item->version_update);
$item->version_update = $version_update->toArray(); $item->version_update = $version_update->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_plugin_updates');
}
} }
return $item; return $item;

View File

@ -98,12 +98,6 @@ class ComponentbuilderModelLanguage extends JModelAdmin
$registry->loadString($item->metadata); $registry->loadString($item->metadata);
$item->metadata = $registry->toArray(); $item->metadata = $registry->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.language');
}
} }
return $item; return $item;

View File

@ -195,12 +195,6 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.language_translation');
}
} }
return $item; return $item;

View File

@ -223,12 +223,6 @@ class ComponentbuilderModelLayout extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.layout');
}
} }
return $item; return $item;

View File

@ -240,12 +240,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.library');
}
} }
return $item; return $item;

View File

@ -106,12 +106,6 @@ class ComponentbuilderModelLibrary_config extends JModelAdmin
$addconfig->loadString($item->addconfig); $addconfig->loadString($item->addconfig);
$item->addconfig = $addconfig->toArray(); $item->addconfig = $addconfig->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.library_config');
}
} }
return $item; return $item;

View File

@ -152,12 +152,6 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
$addurls->loadString($item->addurls); $addurls->loadString($item->addurls);
$item->addurls = $addurls->toArray(); $item->addurls = $addurls->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.library_files_folders_urls');
}
} }
return $item; return $item;

View File

@ -189,12 +189,6 @@ class ComponentbuilderModelPlaceholder extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.placeholder');
}
} }
return $item; return $item;

View File

@ -174,12 +174,6 @@ class ComponentbuilderModelServer extends JModelAdmin
// basic decrypt data username. // basic decrypt data username.
$item->username = rtrim($basic->decryptString($item->username), "\0"); $item->username = rtrim($basic->decryptString($item->username), "\0");
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.server');
}
} }
$this->sales_serverupdate_servervvvw = $item->id; $this->sales_serverupdate_servervvvw = $item->id;

View File

@ -392,12 +392,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
{ {
$this->_db->updateObject('#__componentbuilder_site_view', $objectUpdate, 'id'); $this->_db->updateObject('#__componentbuilder_site_view', $objectUpdate, 'id');
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.site_view');
}
} }
return $item; return $item;

View File

@ -125,12 +125,6 @@ class ComponentbuilderModelSnippet extends JModelAdmin
// base64 Decode snippet. // base64 Decode snippet.
$item->snippet = base64_decode($item->snippet); $item->snippet = base64_decode($item->snippet);
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.snippet');
}
} }
return $item; return $item;

View File

@ -98,12 +98,6 @@ class ComponentbuilderModelSnippet_type extends JModelAdmin
$registry->loadString($item->metadata); $registry->loadString($item->metadata);
$item->metadata = $registry->toArray(); $item->metadata = $registry->toArray();
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.snippet_type');
}
} }
return $item; return $item;

View File

@ -223,12 +223,6 @@ class ComponentbuilderModelTemplate extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.template');
}
} }
return $item; return $item;

View File

@ -192,12 +192,6 @@ class ComponentbuilderModelValidation_rule extends JModelAdmin
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
} }
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_componentbuilder.validation_rule');
}
} }
return $item; return $item;

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.2" method="upgrade"> <extension type="component" version="3.2" method="upgrade">
<name>COM_COMPONENTBUILDER</name> <name>COM_COMPONENTBUILDER</name>
<creationDate>17th May, 2021</creationDate> <creationDate>19th May, 2021</creationDate>
<author>Llewellyn van der Merwe</author> <author>Llewellyn van der Merwe</author>
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail> <authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl> <authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>