From 802554e7a9dee261729774959859f8dd767bc09c Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 11 Apr 2018 22:48:37 +0200 Subject: [PATCH] Fixed line break error in JavaScript building area, also added little notice in field area to select field type. --- README.md | 4 +- admin/README.txt | 4 +- admin/helpers/compiler/e_Interpretation.php | 6 +- .../en-GB/en-GB.com_componentbuilder.ini | 2 + .../field/set_properties_fullwidth.php | 2 +- admin/layouts/field/type_info_fullwidth.php | 3 +- admin/layouts/fieldtype/fields_fullwidth.php | 10 +- admin/models/field.php | 24 +- admin/models/fields.php | 26 +-- admin/models/forms/field.js | 4 +- admin/models/forms/field.xml | 214 +++++++++--------- admin/sql/install.mysql.utf8.sql | 6 +- admin/views/fields/tmpl/default_body.php | 6 +- admin/views/fields/tmpl/default_head.php | 6 +- admin/views/fields/view.html.php | 2 +- script.php | 8 +- 16 files changed, 166 insertions(+), 161 deletions(-) diff --git a/README.md b/README.md index 548d1f96d..0f419c3d5 100644 --- a/README.md +++ b/README.md @@ -130,8 +130,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.7.2 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **189475** -+ *Field count*: **1011** ++ *Line count*: **189480** ++ *Field count*: **1012** + *File count*: **1199** + *Folder count*: **193** diff --git a/admin/README.txt b/admin/README.txt index 548d1f96d..0f419c3d5 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -130,8 +130,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.7.2 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **189475** -+ *Field count*: **1011** ++ *Line count*: **189480** ++ *Field count*: **1012** + *File count*: **1199** + *Folder count*: **193** diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index dcee03e15..94bdc993b 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -9556,7 +9556,7 @@ class Interpretation extends Fields { if (ComponentbuilderHelper::typeField($type, 'list') || ComponentbuilderHelper::typeField($type, 'dynamic') || !ComponentbuilderHelper::typeField($type)) { - $optionsArray = explode(PHP_EOL, $options); + $optionsArray = array_map('trim', (array) explode(PHP_EOL, $options)); if (!ComponentbuilderHelper::checkArray($optionsArray)) { $optionsArray[] = $optionsArray; @@ -9565,7 +9565,7 @@ class Interpretation extends Fields { if (strpos($option, '|') !== false) { - list($option) = explode('|', $option); + list($option) = array_map('trim', (array) explode('|', $option)); } if ($option != 'dynamic_list') { @@ -9582,7 +9582,7 @@ class Interpretation extends Fields { if (strpos($keywords, ',') !== false) { - $keywords = explode(',', $keywords); + $keywords = array_map('trim', (array) explode(',', $keywords)); foreach ($keywords as $keyword) { $buket['keywords'][] = trim($keyword); diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index b0ec0b5dc..502a72463 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -3915,6 +3915,8 @@ COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION="
Searching the database.
" +COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_DESCRIPTION="Please select a field type that you would like to build." +COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_LABEL="Building a field" COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION="

When using the WHMCS encryption you need to get a WHMCS key from:
https://www.vdm.io, or your own WHMCS install.

Please note that you will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.

You can get more info about the WHMCS licensing add-on at the following links.

Helpful Links:
https://www.whmcs.com/addons/licensing-addon/
http://docs.whmcs.com/Licensing_Addon/

" diff --git a/admin/layouts/field/set_properties_fullwidth.php b/admin/layouts/field/set_properties_fullwidth.php index 4b977ed0a..187898754 100644 --- a/admin/layouts/field/set_properties_fullwidth.php +++ b/admin/layouts/field/set_properties_fullwidth.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'xml', + 'note_select_field_type', 'note_filter_information' ); diff --git a/admin/layouts/field/type_info_fullwidth.php b/admin/layouts/field/type_info_fullwidth.php index 8dc52b45f..bbee8b55e 100644 --- a/admin/layouts/field/type_info_fullwidth.php +++ b/admin/layouts/field/type_info_fullwidth.php @@ -30,7 +30,8 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'helpnote' + 'helpnote', + 'xml' ); ?> diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 1f0b6321e..756a78bda 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -61,10 +61,10 @@ $can = ComponentbuilderHelper::getActions('field'); - + - + @@ -104,6 +104,9 @@ $can = ComponentbuilderHelper::getActions('field'); null_switch); ?> + + store); ?> + authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?> escape($item->category_title); ?> @@ -111,9 +114,6 @@ $can = ComponentbuilderHelper::getActions('field'); escape($item->category_title); ?> - - store); ?> - published == 1):?> diff --git a/admin/models/field.php b/admin/models/field.php index e2235c453..5415d14e7 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -112,10 +112,10 @@ class ComponentbuilderModelField extends JModelAdmin $item->css_views = base64_decode($item->css_views); } - if (!empty($item->javascript_views_footer)) + if (!empty($item->css_view)) { - // base64 Decode javascript_views_footer. - $item->javascript_views_footer = base64_decode($item->javascript_views_footer); + // base64 Decode css_view. + $item->css_view = base64_decode($item->css_view); } if (!empty($item->javascript_view_footer)) @@ -124,10 +124,10 @@ class ComponentbuilderModelField extends JModelAdmin $item->javascript_view_footer = base64_decode($item->javascript_view_footer); } - if (!empty($item->css_view)) + if (!empty($item->javascript_views_footer)) { - // base64 Decode css_view. - $item->css_view = base64_decode($item->css_view); + // base64 Decode javascript_views_footer. + $item->javascript_views_footer = base64_decode($item->javascript_views_footer); } @@ -937,10 +937,10 @@ class ComponentbuilderModelField extends JModelAdmin $data['css_views'] = base64_encode($data['css_views']); } - // Set the javascript_views_footer string to base64 string. - if (isset($data['javascript_views_footer'])) + // Set the css_view string to base64 string. + if (isset($data['css_view'])) { - $data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']); + $data['css_view'] = base64_encode($data['css_view']); } // Set the javascript_view_footer string to base64 string. @@ -949,10 +949,10 @@ class ComponentbuilderModelField extends JModelAdmin $data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']); } - // Set the css_view string to base64 string. - if (isset($data['css_view'])) + // Set the javascript_views_footer string to base64 string. + if (isset($data['javascript_views_footer'])) { - $data['css_view'] = base64_encode($data['css_view']); + $data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']); } // Set the Params Items to data diff --git a/admin/models/fields.php b/admin/models/fields.php index 3c6fbe74a..cd2d51d07 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -49,10 +49,10 @@ class ComponentbuilderModelFields extends JModelList 'a.datatype','datatype', 'a.indexes','indexes', 'a.null_switch','null_switch', + 'a.store','store', 'c.title','category_title', 'c.id', 'category_id', - 'a.catid', 'catid', - 'a.store','store' + 'a.catid', 'catid' ); } @@ -88,6 +88,9 @@ class ComponentbuilderModelFields extends JModelList $null_switch = $this->getUserStateFromRequest($this->context . '.filter.null_switch', 'filter_null_switch'); $this->setState('filter.null_switch', $null_switch); + $store = $this->getUserStateFromRequest($this->context . '.filter.store', 'filter_store'); + $this->setState('filter.store', $store); + $category = $app->getUserStateFromRequest($this->context . '.filter.category', 'filter_category'); $this->setState('filter.category', $category); @@ -95,10 +98,7 @@ class ComponentbuilderModelFields extends JModelList $this->setState('filter.category_id', $categoryId); $catid = $app->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid'); - $this->setState('filter.catid', $catid); - - $store = $this->getUserStateFromRequest($this->context . '.filter.store', 'filter_store'); - $this->setState('filter.store', $store); + $this->setState('filter.catid', $catid); $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int'); $this->setState('filter.sorting', $sorting); @@ -313,7 +313,7 @@ class ComponentbuilderModelFields extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.' OR a.xml LIKE '.$search.')'); + $query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.store LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.xml LIKE '.$search.')'); } } @@ -433,12 +433,12 @@ class ComponentbuilderModelFields extends JModelList // decode css_views $item->css_views = base64_decode($item->css_views); - // decode javascript_views_footer - $item->javascript_views_footer = base64_decode($item->javascript_views_footer); - // decode javascript_view_footer - $item->javascript_view_footer = base64_decode($item->javascript_view_footer); // decode css_view $item->css_view = base64_decode($item->css_view); + // decode javascript_view_footer + $item->javascript_view_footer = base64_decode($item->javascript_view_footer); + // decode javascript_views_footer + $item->javascript_views_footer = base64_decode($item->javascript_views_footer); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); @@ -504,10 +504,10 @@ class ComponentbuilderModelFields extends JModelList $id .= ':' . $this->getState('filter.datatype'); $id .= ':' . $this->getState('filter.indexes'); $id .= ':' . $this->getState('filter.null_switch'); + $id .= ':' . $this->getState('filter.store'); $id .= ':' . $this->getState('filter.category'); $id .= ':' . $this->getState('filter.category_id'); - $id .= ':' . $this->getState('filter.catid'); - $id .= ':' . $this->getState('filter.store'); + $id .= ':' . $this->getState('filter.catid'); return parent::getStoreId($id); } diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index 98f7e9048..fb7190970 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -596,8 +596,8 @@ function getFieldOptions(fieldtype){ propertiesArray = result.nameListOptions; // remove previous forms of exist jQuery('.prop_removal').remove(); - // remove the hidden jform_properties - jQuery('#jform_xml').closest('.control-group').remove(); + // hide notice + jQuery('.note_select_field_type').closest('.control-group').remove(); // append to the closed to xml (hidden field) jQuery('.note_filter_information').closest('.control-group').prepend(result.subform); // add the watcher diff --git a/admin/models/forms/field.xml b/admin/models/forms/field.xml index 41dd42ab9..9866736ad 100644 --- a/admin/models/forms/field.xml +++ b/admin/models/forms/field.xml @@ -214,34 +214,90 @@ /> - + + + - + type="radio" + name="add_javascript_views_footer" + label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - COM_COMPONENTBUILDER_FIELD_OTHER - - - - - - - - - - - - - - - - - - - - + + - + - - - - + type="textarea" + name="javascript_view_footer" + label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT" + required="true" + /> COM_COMPONENTBUILDER_FIELD_NO - + - - - - + type="textarea" + name="javascript_views_footer" + label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_HINT" + required="true" + /> COM_COMPONENTBUILDER_FIELD_OTHER - - + + diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 35d653981..2448ef3f9 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -732,13 +732,13 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` ( KEY `idx_indexes` (`indexes`), KEY `idx_null_switch` (`null_switch`), KEY `idx_datadefault_other` (`datadefault_other`), - KEY `idx_datalenght` (`datalenght`), + KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`), + KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`), KEY `idx_add_css_view` (`add_css_view`), KEY `idx_catid` (`catid`), + KEY `idx_datalenght` (`datalenght`), KEY `idx_datalenght_other` (`datalenght_other`), - KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`), KEY `idx_add_css_views` (`add_css_views`), - KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`), KEY `idx_datadefault` (`datadefault`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; diff --git a/admin/views/fields/tmpl/default_body.php b/admin/views/fields/tmpl/default_body.php index b5d7ec0e9..03e04eb0e 100644 --- a/admin/views/fields/tmpl/default_body.php +++ b/admin/views/fields/tmpl/default_body.php @@ -104,6 +104,9 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; null_switch); ?> + + store); ?> + user->authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?> escape($item->category_title); ?> @@ -111,9 +114,6 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; escape($item->category_title); ?> - - store); ?> - get('field.edit.state')) : ?> checked_out) : ?> diff --git a/admin/views/fields/tmpl/default_head.php b/admin/views/fields/tmpl/default_head.php index f6f19daa6..b45a9b76e 100644 --- a/admin/views/fields/tmpl/default_head.php +++ b/admin/views/fields/tmpl/default_head.php @@ -58,12 +58,12 @@ defined('_JEXEC') or die('Restricted access'); listDirn, $this->listOrder); ?> - - listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + + listDirn, $this->listOrder); ?> + canState): ?> listDirn, $this->listOrder); ?> diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index 71fcbd988..7b6fc7d3b 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -377,8 +377,8 @@ class ComponentbuilderViewFields extends JViewLegacy 'a.datatype' => JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL'), 'a.indexes' => JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL'), 'a.null_switch' => JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL'), - 'c.category_title' => JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'), 'a.store' => JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'), + 'c.category_title' => JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'), 'a.id' => JText::_('JGRID_HEADING_ID') ); } diff --git a/script.php b/script.php index 603225603..0483f1743 100644 --- a/script.php +++ b/script.php @@ -3428,9 +3428,9 @@ class com_componentbuilderInstallerScript $field->type_title = 'Componentbuilder Field'; $field->type_alias = 'com_componentbuilder.field'; $field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datadefault_other":"datadefault_other","css_views":"css_views","javascript_views_footer":"javascript_views_footer","javascript_view_footer":"javascript_view_footer","datalenght":"datalenght","add_css_view":"add_css_view","not_required":"not_required","css_view":"css_view","store":"store","datalenght_other":"datalenght_other","add_javascript_view_footer":"add_javascript_view_footer","add_css_views":"add_css_views","add_javascript_views_footer":"add_javascript_views_footer","datadefault":"datadefault","xml":"xml"}}'; + $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datadefault_other":"datadefault_other","css_views":"css_views","add_javascript_views_footer":"add_javascript_views_footer","add_javascript_view_footer":"add_javascript_view_footer","store":"store","add_css_view":"add_css_view","not_required":"not_required","datalenght":"datalenght","css_view":"css_view","datalenght_other":"datalenght_other","javascript_view_footer":"javascript_view_footer","add_css_views":"add_css_views","javascript_views_footer":"javascript_views_footer","datadefault":"datadefault","xml":"xml"}}'; $field->router = 'ComponentbuilderHelperRoute::getFieldRoute'; - $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_css_view","not_required","catid","store","add_javascript_view_footer","add_css_views","add_javascript_views_footer"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; + $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_javascript_views_footer","add_javascript_view_footer","store","add_css_view","not_required","catid","add_css_views"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $field_Inserted = $db->insertObject('#__content_types', $field); @@ -4037,9 +4037,9 @@ class com_componentbuilderInstallerScript $field->type_title = 'Componentbuilder Field'; $field->type_alias = 'com_componentbuilder.field'; $field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datadefault_other":"datadefault_other","css_views":"css_views","javascript_views_footer":"javascript_views_footer","javascript_view_footer":"javascript_view_footer","datalenght":"datalenght","add_css_view":"add_css_view","not_required":"not_required","css_view":"css_view","store":"store","datalenght_other":"datalenght_other","add_javascript_view_footer":"add_javascript_view_footer","add_css_views":"add_css_views","add_javascript_views_footer":"add_javascript_views_footer","datadefault":"datadefault","xml":"xml"}}'; + $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datadefault_other":"datadefault_other","css_views":"css_views","add_javascript_views_footer":"add_javascript_views_footer","add_javascript_view_footer":"add_javascript_view_footer","store":"store","add_css_view":"add_css_view","not_required":"not_required","datalenght":"datalenght","css_view":"css_view","datalenght_other":"datalenght_other","javascript_view_footer":"javascript_view_footer","add_css_views":"add_css_views","javascript_views_footer":"javascript_views_footer","datadefault":"datadefault","xml":"xml"}}'; $field->router = 'ComponentbuilderHelperRoute::getFieldRoute'; - $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_css_view","not_required","catid","store","add_javascript_view_footer","add_css_views","add_javascript_views_footer"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; + $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_javascript_views_footer","add_javascript_view_footer","store","add_css_view","not_required","catid","add_css_views"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; // Check if field type is already in content_type DB. $field_id = null;