joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

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.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2021-05-19 17:44:14 +02:00
parent 0f00ff90ed
commit d5482d65cb
55 changed files with 64 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin/helpers/compiler/c_Fields.php
View File

@ -4578,6 +4578,12 @@ class Fields extends Structure
$nameListCode, $name, $view, $field, $typeName, $multiple,
$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 = true;
if (isset($field['list']) && $field['list'] == 2)
@ -4585,11 +4591,6 @@ class Fields extends Structure
// do not add this field to the database
$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))
{
// insure default not none if number type

53
admin/helpers/compiler/e_Interpretation.php
View File

@ -7299,6 +7299,8 @@ class Interpretation extends Fields
// get the component name
$Component = $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh];
$component = $this->fileContentStatic[$this->hhh . 'component'
. $this->hhh];
// go from base64 to string
if (isset($this->base64Builder[$view])
&& ComponentbuilderHelper::checkArray($this->base64Builder[$view]))
@ -7453,7 +7455,21 @@ class Interpretation extends Fields
$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
$script .= $this->getCustomScriptBuilder(
'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) . "}"
. 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
if ($export || $all)
{