forked from joomla/Component-Builder
Fixed gh-511 so that custom fields also get copied to module fields if set to do so.
This commit is contained in:
parent
a31f09aaa3
commit
630bfcb177
@ -144,7 +144,7 @@ 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*: 12th January, 2020
|
+ *Last Build*: 25th January, 2020
|
||||||
+ *Version*: 2.10.10
|
+ *Version*: 2.10.10
|
||||||
+ *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
|
+ *Copyright*: Copyright (C) 2015 - 2019 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
|
||||||
|
@ -144,7 +144,7 @@ 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*: 12th January, 2020
|
+ *Last Build*: 25th January, 2020
|
||||||
+ *Version*: 2.10.10
|
+ *Version*: 2.10.10
|
||||||
+ *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
|
+ *Copyright*: Copyright (C) 2015 - 2019 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
|
||||||
|
@ -228,6 +228,13 @@ class Structure extends Get
|
|||||||
*/
|
*/
|
||||||
public $fileContentStatic = array();
|
public $fileContentStatic = array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extention Custom Fields
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
public $extentionCustomfields = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The standard folders
|
* The standard folders
|
||||||
*
|
*
|
||||||
|
@ -347,13 +347,6 @@ class Fields extends Structure
|
|||||||
*/
|
*/
|
||||||
public $movedPublishingFields = array();
|
public $movedPublishingFields = array();
|
||||||
|
|
||||||
/**
|
|
||||||
* Extention Custom Fields
|
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
public $extentionCustomfields = array();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the line number in comments
|
* Set the line number in comments
|
||||||
*
|
*
|
||||||
@ -1720,8 +1713,8 @@ class Fields extends Structure
|
|||||||
}
|
}
|
||||||
$field .= PHP_EOL . $this->_t(2) . $taber . "/>";
|
$field .= PHP_EOL . $this->_t(2) . $taber . "/>";
|
||||||
// incase the field is in the config and has not been set
|
// incase the field is in the config and has not been set
|
||||||
if ('config' === $view_name_single && 'configs' === $view_name_list||
|
if ('config' === $view_name_single && 'configs' === $view_name_list ||
|
||||||
strpos($view_name_single, 'P|uG!n') !== false)
|
(strpos($view_name_single, 'P|uG!n') !== false || strpos($view_name_single, 'M0dU|3') !== false))
|
||||||
{
|
{
|
||||||
// set lang (just incase)
|
// set lang (just incase)
|
||||||
$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
|
$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
|
||||||
@ -2208,7 +2201,7 @@ class Fields extends Structure
|
|||||||
}
|
}
|
||||||
// incase the field is in the config and has not been set (or is part of a plugin or module)
|
// incase the field is in the config and has not been set (or is part of a plugin or module)
|
||||||
if (('config' === $view_name_single && 'configs' === $view_name_list) ||
|
if (('config' === $view_name_single && 'configs' === $view_name_list) ||
|
||||||
strpos($view_name_single, 'P|uG!n') !== false)
|
(strpos($view_name_single, 'P|uG!n') !== false || strpos($view_name_single, 'M0dU|3') !== false))
|
||||||
{
|
{
|
||||||
// set lang (just incase)
|
// set lang (just incase)
|
||||||
$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
|
$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
|
||||||
@ -3324,7 +3317,7 @@ class Fields extends Structure
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// if this field gets used in plugin or module we should track it so if needed we can copy it over
|
// if this field gets used in plugin or module we should track it so if needed we can copy it over
|
||||||
if (strpos($view_name_single, 'P|uG!n') !== false &&
|
if ((strpos($view_name_single, 'P|uG!n') !== false || strpos($view_name_single, 'M0dU|3') !== false) &&
|
||||||
isset($data['custom']) && isset($data['custom']['type']))
|
isset($data['custom']) && isset($data['custom']['type']))
|
||||||
{
|
{
|
||||||
$this->extentionCustomfields[$data['type']] = $data['custom']['type'];
|
$this->extentionCustomfields[$data['type']] = $data['custom']['type'];
|
||||||
|
@ -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>12th January, 2020</creationDate>
|
<creationDate>25th January, 2020</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>
|
||||||
|
Loading…
Reference in New Issue
Block a user