From 5553e2b822fdf1fcc5c51aaebf430dea670a6745 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 30 Oct 2017 21:19:39 +0200 Subject: [PATCH] removed linked components from admin views. --- README.md | 4 +- admin/README.txt | 4 +- admin/assets/css/admin_view.css | 4 +- admin/assets/css/admin_views.css | 4 +- admin/controllers/admin_view.php | 4 +- admin/controllers/admin_views.php | 4 +- .../en-GB/en-GB.com_componentbuilder.ini | 1 - .../linked_components_fullwidth.php | 138 -------------- .../linked_components_fullwidth.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 2 +- admin/models/admin_view.php | 147 +++----------- admin/models/admin_views.php | 16 +- admin/models/custom_admin_view.php | 10 +- admin/models/fieldtype.php | 26 +-- admin/models/forms/admin_view.js | 4 +- admin/models/forms/admin_view.xml | 180 +++++++++--------- admin/models/forms/custom_admin_view.js | 88 ++++----- admin/models/forms/custom_code.js | 36 ++-- admin/models/forms/dynamic_get.js | 174 ++++++++--------- admin/models/forms/field.js | 80 ++++---- admin/models/forms/help_document.js | 60 +++--- admin/models/forms/layout.js | 10 +- admin/models/forms/site_view.js | 98 +++++----- admin/models/forms/template.js | 10 +- admin/models/ftp.php | 16 +- admin/models/site_view.php | 10 +- admin/sql/install.mysql.utf8.sql | 2 +- admin/tables/admin_view.php | 4 +- admin/views/admin_view/submitbutton.js | 4 +- admin/views/admin_view/tmpl/edit.php | 16 +- admin/views/admin_view/view.html.php | 21 +- admin/views/admin_views/tmpl/default.php | 4 +- .../admin_views/tmpl/default_batch_body.php | 4 +- .../admin_views/tmpl/default_batch_footer.php | 4 +- admin/views/admin_views/tmpl/default_body.php | 4 +- admin/views/admin_views/tmpl/default_foot.php | 4 +- admin/views/admin_views/tmpl/default_head.php | 4 +- .../admin_views/tmpl/default_toolbar.php | 4 +- admin/views/admin_views/view.html.php | 4 +- admin/views/custom_admin_view/view.html.php | 2 +- admin/views/fieldtype/view.html.php | 2 +- admin/views/ftp/view.html.php | 2 +- admin/views/site_view/view.html.php | 2 +- script.php | 8 +- 46 files changed, 487 insertions(+), 744 deletions(-) delete mode 100644 admin/layouts/admin_view/linked_components_fullwidth.php diff --git a/README.md b/README.md index eee083dbb..d7c7299b8 100644 --- a/README.md +++ b/README.md @@ -115,8 +115,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.6.0 + *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*: **159502** -+ *File count*: **999** ++ *Line count*: **159245** ++ *File count*: **998** + *Folder count*: **165** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/README.txt b/admin/README.txt index eee083dbb..d7c7299b8 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -115,8 +115,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.6.0 + *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*: **159502** -+ *File count*: **999** ++ *Line count*: **159245** ++ *File count*: **998** + *Folder count*: **165** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index ad6d2bf1d..bf2fcbd91 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index 0ef8cdd0a..f3d633ca3 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index d5dcc0b0f..4d0917f2f 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index c4636233d..336ca7f8a 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 5c5c18c37..45775e439 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -537,7 +537,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key" COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp" COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last" COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link" -COM_COMPONENTBUILDER_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2" COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location" diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php deleted file mode 100644 index beca64e32..000000000 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ /dev/null @@ -1,138 +0,0 @@ - - @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Builds Complex Joomla Components - -/-----------------------------------------------------------------------------------------------------------------------------*/ - -// No direct access to this file - -defined('_JEXEC') or die('Restricted access'); - -// set the defaults -$items = $displayData->vxvlinked_components; -$user = JFactory::getUser(); -$id = $displayData->item->id; -$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; - -?> -
- - - - - - - - - - - - - - - - $item): ?> - authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; - $userChkOut = JFactory::getUser($item->checked_out); - $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); - ?> - - - - - - - - published == 1):?> - - published == 0):?> - - published == 2):?> - - published == -2):?> - - - - - - -
- - - - - - - - - - - - - - - -
- get('joomla_component.edit')): ?> - escape($item->system_name); ?> - checked_out): ?> - name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> - - -
escape($item->system_name); ?>
- - 		- escape($item->name_code); ?> - - escape($item->component_version); ?> - - escape($item->short_description); ?> - - escape($item->companyname); ?> - - escape($item->author); ?> - - - - - - - - - - - - - - - - - - id; ?> -
- -
- -
- -
diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 59c6cd54c..86bafd684 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyflinked_components; +$items = $displayData->vyelinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 68398de21..d247159e5 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vzxfields; +$items = $displayData->vzwfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index a119a0ed2..d2cc2e319 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vzylinked_components; +$items = $displayData->vzxlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index 32ee2b802..204a262bd 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyqlinked_components; +$items = $displayData->vyplinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 4f1af536e..75f0a4990 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -148,16 +148,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->ajax_input = $ajax_input->toArray(); } - if (!empty($item->php_getitems)) + if (!empty($item->php_after_delete)) { - // base64 Decode php_getitems. - $item->php_getitems = base64_decode($item->php_getitems); - } - - if (!empty($item->php_batchmove)) - { - // base64 Decode php_batchmove. - $item->php_batchmove = base64_decode($item->php_batchmove); + // base64 Decode php_after_delete. + $item->php_after_delete = base64_decode($item->php_after_delete); } if (!empty($item->php_save)) @@ -166,10 +160,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_save = base64_decode($item->php_save); } - if (!empty($item->php_after_delete)) + if (!empty($item->php_batchmove)) { - // base64 Decode php_after_delete. - $item->php_after_delete = base64_decode($item->php_after_delete); + // base64 Decode php_batchmove. + $item->php_batchmove = base64_decode($item->php_batchmove); } if (!empty($item->php_getlistquery)) @@ -190,6 +184,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_after_publish = base64_decode($item->php_after_publish); } + if (!empty($item->php_getitems)) + { + // base64 Decode php_getitems. + $item->php_getitems = base64_decode($item->php_getitems); + } + if (!empty($item->php_import)) { // base64 Decode php_import. @@ -408,102 +408,9 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->tags = new JHelperTags; $item->tags->getTagIds($item->id, 'com_componentbuilder.admin_view'); } - } - $this->addadmin_viewsvvvw = $item->id; + } return $item; - } - - /** - * Method to get list data. - * - * @return mixed An array of data items on success, false on failure. - */ - public function getVxvlinked_components() - { - // Get the user object. - $user = JFactory::getUser(); - // Create a new query object. - $db = JFactory::getDBO(); - $query = $db->getQuery(true); - - // Select some fields - $query->select('a.*'); - - // From the componentbuilder_joomla_component table - $query->from($db->quoteName('#__componentbuilder_joomla_component', 'a')); - - // Join over the asset groups. - $query->select('ag.title AS access_level'); - $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // Filter by access level. - if ($access = $this->getState('filter.access')) - { - $query->where('a.access = ' . (int) $access); - } - // Implement View Level Access - if (!$user->authorise('core.options', 'com_componentbuilder')) - { - $groups = implode(',', $user->getAuthorisedViewLevels()); - $query->where('a.access IN (' . $groups . ')'); - } - - // Order the results by ordering - $query->order('a.published ASC'); - $query->order('a.ordering ASC'); - - // Load the items - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - $items = $db->loadObjectList(); - - // set values to display correctly. - if (ComponentbuilderHelper::checkArray($items)) - { - // get user object. - $user = JFactory::getUser(); - foreach ($items as $nr => &$item) - { - $access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $item->id) && $user->authorise('joomla_component.access', 'com_componentbuilder')); - if (!$access) - { - unset($items[$nr]); - continue; - } - - } - } - - // Filter by addadmin_viewsvvvw in this Repetable Field - if (ComponentbuilderHelper::checkArray($items) && isset($this->addadmin_viewsvvvw)) - { - foreach ($items as $nr => &$item) - { - if (isset($item->addadmin_views) && ComponentbuilderHelper::checkJson($item->addadmin_views)) - { - $tmpArray = json_decode($item->addadmin_views,true); - if (!isset($tmpArray['adminview']) || !ComponentbuilderHelper::checkArray($tmpArray['adminview']) || !in_array($this->addadmin_viewsvvvw, $tmpArray['adminview'])) - { - unset($items[$nr]); - continue; - } - } - else - { - unset($items[$nr]); - continue; - } - } - } - else - { - return false; - } - return $items; - } - return false; } /** @@ -1357,16 +1264,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['ajax_input'] = ''; } - // Set the php_getitems string to base64 string. - if (isset($data['php_getitems'])) + // Set the php_after_delete string to base64 string. + if (isset($data['php_after_delete'])) { - $data['php_getitems'] = base64_encode($data['php_getitems']); - } - - // Set the php_batchmove string to base64 string. - if (isset($data['php_batchmove'])) - { - $data['php_batchmove'] = base64_encode($data['php_batchmove']); + $data['php_after_delete'] = base64_encode($data['php_after_delete']); } // Set the php_save string to base64 string. @@ -1375,10 +1276,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_save'] = base64_encode($data['php_save']); } - // Set the php_after_delete string to base64 string. - if (isset($data['php_after_delete'])) + // Set the php_batchmove string to base64 string. + if (isset($data['php_batchmove'])) { - $data['php_after_delete'] = base64_encode($data['php_after_delete']); + $data['php_batchmove'] = base64_encode($data['php_batchmove']); } // Set the php_getlistquery string to base64 string. @@ -1399,6 +1300,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_after_publish'] = base64_encode($data['php_after_publish']); } + // Set the php_getitems string to base64 string. + if (isset($data['php_getitems'])) + { + $data['php_getitems'] = base64_encode($data['php_getitems']); + } + // Set the php_import string to base64 string. if (isset($data['php_import'])) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 99c9f82da..3831b8119 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php @@ -262,20 +262,20 @@ class ComponentbuilderModelAdmin_views extends JModelList continue; } - // decode php_getitems - $item->php_getitems = base64_decode($item->php_getitems); - // decode php_batchmove - $item->php_batchmove = base64_decode($item->php_batchmove); - // decode php_save - $item->php_save = base64_decode($item->php_save); // decode php_after_delete $item->php_after_delete = base64_decode($item->php_after_delete); + // decode php_save + $item->php_save = base64_decode($item->php_save); + // decode php_batchmove + $item->php_batchmove = base64_decode($item->php_batchmove); // decode php_getlistquery $item->php_getlistquery = base64_decode($item->php_getlistquery); // decode php_allowedit $item->php_allowedit = base64_decode($item->php_allowedit); // decode php_after_publish $item->php_after_publish = base64_decode($item->php_after_publish); + // decode php_getitems + $item->php_getitems = base64_decode($item->php_getitems); // decode php_import $item->php_import = base64_decode($item->php_import); // decode php_getitems_after_all diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index a231f1724..887ace17a 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -198,7 +198,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.custom_admin_view'); } } - $this->addcustom_admin_viewsvvvx = $item->id; + $this->addcustom_admin_viewsvvvw = $item->id; return $item; } @@ -208,7 +208,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVyflinked_components() + public function getVyelinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -265,15 +265,15 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin } } - // Filter by addcustom_admin_viewsvvvx in this Repetable Field - if (ComponentbuilderHelper::checkArray($items) && isset($this->addcustom_admin_viewsvvvx)) + // Filter by addcustom_admin_viewsvvvw in this Repetable Field + if (ComponentbuilderHelper::checkArray($items) && isset($this->addcustom_admin_viewsvvvw)) { foreach ($items as $nr => &$item) { if (isset($item->addcustom_admin_views) && ComponentbuilderHelper::checkJson($item->addcustom_admin_views)) { $tmpArray = json_decode($item->addcustom_admin_views,true); - if (!isset($tmpArray['customadminview']) || !ComponentbuilderHelper::checkArray($tmpArray['customadminview']) || !in_array($this->addcustom_admin_viewsvvvx, $tmpArray['customadminview'])) + if (!isset($tmpArray['customadminview']) || !ComponentbuilderHelper::checkArray($tmpArray['customadminview']) || !in_array($this->addcustom_admin_viewsvvvw, $tmpArray['customadminview'])) { unset($items[$nr]); continue; diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index b35dba99c..5442204e9 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -129,7 +129,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype'); } } - $this->fieldtypevvvz = $item->id; + $this->fieldtypevvvy = $item->id; return $item; } @@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzxfields() + public function getVzwfields() { // Get the user object. $user = JFactory::getUser(); @@ -159,15 +159,15 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $query->select($db->quoteName('g.name','fieldtype_name')); $query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by fieldtypevvvz global. - $fieldtypevvvz = $this->fieldtypevvvz; - if (is_numeric($fieldtypevvvz )) + // Filter by fieldtypevvvy global. + $fieldtypevvvy = $this->fieldtypevvvy; + if (is_numeric($fieldtypevvvy )) { - $query->where('a.fieldtype = ' . (int) $fieldtypevvvz ); + $query->where('a.fieldtype = ' . (int) $fieldtypevvvy ); } - elseif (is_string($fieldtypevvvz)) + elseif (is_string($fieldtypevvvy)) { - $query->where('a.fieldtype = ' . $db->quote($fieldtypevvvz)); + $query->where('a.fieldtype = ' . $db->quote($fieldtypevvvy)); } else { @@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVzxfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVzwfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVzxfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVzwfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVzxfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVzwfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVzxfields($item->store, 'store'); + $item->store = $this->selectionTranslationVzwfields($item->store, 'store'); } } @@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVzxfields($value,$name) + public function selectionTranslationVzwfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index d18c89172..faa5545ad 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index f715e8bd9..4fc0fa872 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -149,31 +149,34 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> - + + + - + - - - - - - - - - - - - COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY - + + + @@ -293,19 +252,19 @@ filter="HTML" hint="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT" /> - + - - - - + type="textarea" + name="php_allowedit" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_HINT" + required="true" + /> COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE + + + + + + + + + + + + tags->getTagIds($item->id, 'com_componentbuilder.ftp'); } } - $this->sales_server_ftpupdate_server_ftp_vvwa = $item->id; + $this->sales_server_ftpupdate_server_ftp_vvvz = $item->id; return $item; } @@ -122,7 +122,7 @@ class ComponentbuilderModelFtp extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzylinked_components() + public function getVzxlinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -136,15 +136,15 @@ class ComponentbuilderModelFtp extends JModelAdmin // From the componentbuilder_joomla_component table $query->from($db->quoteName('#__componentbuilder_joomla_component', 'a')); - // Filter by sales_server_ftpupdate_server_ftp_vvwa global. - $sales_server_ftpupdate_server_ftp_vvwa = $this->sales_server_ftpupdate_server_ftp_vvwa; - if (is_numeric($sales_server_ftpupdate_server_ftp_vvwa )) + // Filter by sales_server_ftpupdate_server_ftp_vvvz global. + $sales_server_ftpupdate_server_ftp_vvvz = $this->sales_server_ftpupdate_server_ftp_vvvz; + if (is_numeric($sales_server_ftpupdate_server_ftp_vvvz )) { - $query->where('a.sales_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwa . ' OR a.update_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwa, ' OR'); + $query->where('a.sales_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvvz . ' OR a.update_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvvz, ' OR'); } - elseif (is_string($sales_server_ftpupdate_server_ftp_vvwa)) + elseif (is_string($sales_server_ftpupdate_server_ftp_vvvz)) { - $query->where('a.sales_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwa) . ' OR a.update_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwa), ' OR'); + $query->where('a.sales_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvvz) . ' OR a.update_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvvz), ' OR'); } else { diff --git a/admin/models/site_view.php b/admin/models/site_view.php index 11d08dede..0a04070be 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -230,7 +230,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.site_view'); } } - $this->addsite_viewsvvvy = $item->id; + $this->addsite_viewsvvvx = $item->id; return $item; } @@ -240,7 +240,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVyqlinked_components() + public function getVyplinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -297,15 +297,15 @@ class ComponentbuilderModelSite_view extends JModelAdmin } } - // Filter by addsite_viewsvvvy in this Repetable Field - if (ComponentbuilderHelper::checkArray($items) && isset($this->addsite_viewsvvvy)) + // Filter by addsite_viewsvvvx in this Repetable Field + if (ComponentbuilderHelper::checkArray($items) && isset($this->addsite_viewsvvvx)) { foreach ($items as $nr => &$item) { if (isset($item->addsite_views) && ComponentbuilderHelper::checkJson($item->addsite_views)) { $tmpArray = json_decode($item->addsite_views,true); - if (!isset($tmpArray['siteview']) || !ComponentbuilderHelper::checkArray($tmpArray['siteview']) || !in_array($this->addsite_viewsvvvy, $tmpArray['siteview'])) + if (!isset($tmpArray['siteview']) || !ComponentbuilderHelper::checkArray($tmpArray['siteview']) || !in_array($this->addsite_viewsvvvx, $tmpArray['siteview'])) { unset($items[$nr]); continue; diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 58b0e1611..2b5274214 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -222,8 +222,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( KEY `idx_name_single` (`name_single`), KEY `idx_name_list` (`name_list`), KEY `idx_type` (`type`), - KEY `idx_source` (`source`), KEY `idx_add_fadein` (`add_fadein`), + KEY `idx_source` (`source`), KEY `idx_add_css_view` (`add_css_view`), KEY `idx_add_php_getitems` (`add_php_getitems`), KEY `idx_add_css_views` (`add_css_views`), diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 60b9394e9..b690e12c0 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index f208afed3..630e4d8cc 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index 90994c6ba..dbfb130dd 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -156,18 +156,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder'); - canDo->get('joomla_component.access')) : ?> - -
-
-
-
- -
-
- - -
diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index f9c9ce13f..301206b0b 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -61,10 +61,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy { // return to the list view that refered to this item $this->referral = '&ref='.(string)$this->ref; - } - - // Get Linked view data - $this->vxvlinked_components = $this->get('Vxvlinked_components'); + } // Set the toolbar $this->addToolBar(); @@ -196,17 +193,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT')); $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_view.css"); // Add Ajax Token - $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); - - // Add the CSS for Footable - $document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css'); - $document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable/css/footable.standalone.min.css'); - // Add the JavaScript for Footable (adding all funtions) - $document->addScript(JURI::root() .'media/com_componentbuilder/footable/js/footable.min.js'); - - $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});"; - $document->addScriptDeclaration($footable); - + $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); $document->addScript(JURI::root() . $this->script); $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_view/submitbutton.js"); // add JavaScripts diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index a57ae57aa..f26616321 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index ccc77b344..a26379e8b 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index aacd01311..27017c8ea 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 1f002fdb7..4129114e3 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index 73d04a3e7..2af5b372e 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index ae08d3f85..780af6107 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index ab67c1e5d..6d06c730a 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 77af96a80..6ffc04ac9 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 244 of this MVC - @build 29th October, 2017 + @version @update number 247 of this MVC + @build 30th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index 8e9179cc1..6f67b43d3 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -64,7 +64,7 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy } // Get Linked view data - $this->vyflinked_components = $this->get('Vyflinked_components'); + $this->vyelinked_components = $this->get('Vyelinked_components'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index 8b6e4f0ce..9d2d56ecf 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -64,7 +64,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy } // Get Linked view data - $this->vzxfields = $this->get('Vzxfields'); + $this->vzwfields = $this->get('Vzwfields'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/ftp/view.html.php b/admin/views/ftp/view.html.php index c58c1f92b..056cbf3a7 100644 --- a/admin/views/ftp/view.html.php +++ b/admin/views/ftp/view.html.php @@ -64,7 +64,7 @@ class ComponentbuilderViewFtp extends JViewLegacy } // Get Linked view data - $this->vzylinked_components = $this->get('Vzylinked_components'); + $this->vzxlinked_components = $this->get('Vzxlinked_components'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index 681b1161f..e0bb6cfea 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -64,7 +64,7 @@ class ComponentbuilderViewSite_view extends JViewLegacy } // Get Linked view data - $this->vyqlinked_components = $this->get('Vyqlinked_components'); + $this->vyplinked_components = $this->get('Vyplinked_components'); // Set the toolbar $this->addToolBar(); diff --git a/script.php b/script.php index 9e1978a1b..5d71f1bc6 100644 --- a/script.php +++ b/script.php @@ -2874,9 +2874,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","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": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","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": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","php_after_delete":"php_after_delete","icon_category":"icon_category","icon_add":"icon_add","php_save":"php_save","type":"type","php_batchmove":"php_batchmove","php_getlistquery":"php_getlistquery","description":"description","php_allowedit":"php_allowedit","add_fadein":"add_fadein","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"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"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","add_fadein","source","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"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"}]}'; // Set the object into the content types table. $admin_view_Inserted = $db->insertObject('#__content_types', $admin_view); @@ -3253,9 +3253,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","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": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","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": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","php_after_delete":"php_after_delete","icon_category":"icon_category","icon_add":"icon_add","php_save":"php_save","type":"type","php_batchmove":"php_batchmove","php_getlistquery":"php_getlistquery","description":"description","php_allowedit":"php_allowedit","add_fadein":"add_fadein","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"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"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","add_fadein","source","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"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"}]}'; // Check if admin_view type is already in content_type DB. $admin_view_id = null;