<?php echo JText::_('Text'); ?>"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL="Add Language String"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION="All libraries you select will dynamically be added to the header of the page according to the settings of the selected library. Each library will also get its respective buttons added to the component global options if it has any set. Please take a look at the libraries for more details."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL="Select libraries you would like to use in your code"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL="Snippet Usage"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL="Snippet Details"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTIFICATION="Notification"
@@ -2740,6 +2746,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SMILEY_SAD="Smiley Sad"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SMILEY_SAD_TWO="Smiley Sad 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SMILEY_TWO="Smiley 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SNIPPET="Snippet"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SNIPPET_DESCRIPTION="Select a snippet you would like to use or review."
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SNIPPET_LABEL="Select a Snippet"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SQUARE="Square"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STACK="Stack"
@@ -3045,6 +3052,7 @@ COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_COMPONENT_ADD="Add Joomla ComponentgetForm();
$fields = $displayData->get('fields') ?: array(
- 'note_add_language_string',
'default'
);
diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php
index ff3c7fd86..67dfa2a56 100644
--- a/admin/layouts/custom_admin_view/details_left.php
+++ b/admin/layouts/custom_admin_view/details_left.php
@@ -33,8 +33,9 @@ $fields = $displayData->get('fields') ?: array(
'name',
'codename',
'description',
- 'snippet',
- 'note_snippet_usage'
+ 'note_libraries_selection',
+ 'libraries',
+ 'note_add_language_string'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();
diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php
index 32cf0e554..6eec871a4 100644
--- a/admin/layouts/custom_admin_view/details_right.php
+++ b/admin/layouts/custom_admin_view/details_right.php
@@ -31,7 +31,9 @@ $form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
'icon',
- 'note_uikit_snippet'
+ 'snippet',
+ 'note_uikit_snippet',
+ 'note_snippet_usage'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index fdfa5539b..b57918936 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->vzufields;
+$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 f2557f52e..a437256a6 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->vzvlinked_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/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php
index a2258aef9..649984a09 100644
--- a/admin/layouts/layout/details_fullwidth.php
+++ b/admin/layouts/layout/details_fullwidth.php
@@ -30,7 +30,6 @@ defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
- 'note_add_language_string',
'layout'
);
diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php
index 35ea371dc..352879ab6 100644
--- a/admin/layouts/layout/details_left.php
+++ b/admin/layouts/layout/details_left.php
@@ -33,8 +33,9 @@ $fields = $displayData->get('fields') ?: array(
'name',
'alias',
'description',
- 'snippet',
- 'note_snippet_usage'
+ 'note_libraries_selection',
+ 'libraries',
+ 'note_add_language_string'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();
diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php
index 4665583e1..d5039e115 100644
--- a/admin/layouts/layout/details_right.php
+++ b/admin/layouts/layout/details_right.php
@@ -30,7 +30,9 @@ defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
- 'note_uikit_snippet'
+ 'snippet',
+ 'note_uikit_snippet',
+ 'note_snippet_usage'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();
diff --git a/admin/layouts/library/behaviour_above.php b/admin/layouts/library/behaviour_above.php
new file mode 100644
index 000000000..55d0e6df3
--- /dev/null
+++ b/admin/layouts/library/behaviour_above.php
@@ -0,0 +1,42 @@
+
+ @github Joomla Component Builder
+ renderField($field);
+ } ?>
+
diff --git a/admin/layouts/library/behaviour_fullwidth.php b/admin/layouts/library/behaviour_fullwidth.php
new file mode 100644
index 000000000..0530f76ae
--- /dev/null
+++ b/admin/layouts/library/behaviour_fullwidth.php
@@ -0,0 +1,52 @@
+
+ @github Joomla Component Builder
+
+
diff --git a/admin/layouts/library/details_right.php b/admin/layouts/library/behaviour_right.php
similarity index 96%
rename from admin/layouts/library/details_right.php
rename to admin/layouts/library/behaviour_right.php
index 92112f79b..9371a467f 100644
--- a/admin/layouts/library/details_right.php
+++ b/admin/layouts/library/behaviour_right.php
@@ -13,7 +13,7 @@
@version 2.6.x
@created 30th April, 2015
@package Component Builder
- @subpackage details_right.php
+ @subpackage behaviour_right.php
@author Llewellyn van der Merwe
+
+
+
+ getLabel($field); ?>
+
+
+ getInput($field); ?>
+
+
+ renderField($field);
+ } ?>
+
diff --git a/admin/layouts/library/config_fullwidth.php b/admin/layouts/library/config_fullwidth.php
new file mode 100644
index 000000000..f78b33db2
--- /dev/null
+++ b/admin/layouts/library/config_fullwidth.php
@@ -0,0 +1,50 @@
+
+ @github Joomla Component Builder
+
+
diff --git a/admin/layouts/library/files_folders_urls_fullwidth.php b/admin/layouts/library/files_folders_urls_fullwidth.php
new file mode 100644
index 000000000..9b00b61e2
--- /dev/null
+++ b/admin/layouts/library/files_folders_urls_fullwidth.php
@@ -0,0 +1,49 @@
+
+ @github Joomla Component Builder
+
+
+
+ getLabel($field); ?>
+
+
+ getInput($field); ?>
+
+
+
+
diff --git a/admin/layouts/library_config/index.html b/admin/layouts/library_config/index.html
new file mode 100644
index 000000000..fa6d84e80
--- /dev/null
+++ b/admin/layouts/library_config/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/admin/layouts/library/details_left.php b/admin/layouts/library_config/publishing.php
similarity index 93%
rename from admin/layouts/library/details_left.php
rename to admin/layouts/library_config/publishing.php
index 892f7233e..13d13ed74 100644
--- a/admin/layouts/library/details_left.php
+++ b/admin/layouts/library_config/publishing.php
@@ -13,7 +13,7 @@
@version 2.6.x
@created 30th April, 2015
@package Component Builder
- @subpackage details_left.php
+ @subpackage publishing.php
@author Llewellyn van der Merwe
+
+
+
+ getLabel($field); ?>
+
+
+ getInput($field); ?>
+
+
+ renderField($field);
+ } ?>
+
diff --git a/admin/layouts/library_config/tweaks_fullwidth.php b/admin/layouts/library_config/tweaks_fullwidth.php
new file mode 100644
index 000000000..e832119f3
--- /dev/null
+++ b/admin/layouts/library_config/tweaks_fullwidth.php
@@ -0,0 +1,48 @@
+
+ @github Joomla Component Builder
+
+
diff --git a/admin/layouts/library_files_folders_urls/index.html b/admin/layouts/library_files_folders_urls/index.html
new file mode 100644
index 000000000..fa6d84e80
--- /dev/null
+++ b/admin/layouts/library_files_folders_urls/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/admin/layouts/library_files_folders_urls/publishing.php b/admin/layouts/library_files_folders_urls/publishing.php
new file mode 100644
index 000000000..13d13ed74
--- /dev/null
+++ b/admin/layouts/library_files_folders_urls/publishing.php
@@ -0,0 +1,58 @@
+
+ @github Joomla Component Builder
+
+
+
+ getLabel($field); ?>
+
+
+ getInput($field); ?>
+
+
+ renderField($field);
+ } ?>
+
diff --git a/admin/layouts/library_files_folders_urls/settings_fullwidth.php b/admin/layouts/library_files_folders_urls/settings_fullwidth.php
new file mode 100644
index 000000000..db6dbca1c
--- /dev/null
+++ b/admin/layouts/library_files_folders_urls/settings_fullwidth.php
@@ -0,0 +1,53 @@
+
+ @github Joomla Component Builder
+
+
diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php
index 6c422bc54..1a572bf4e 100644
--- a/admin/layouts/site_view/details_fullwidth.php
+++ b/admin/layouts/site_view/details_fullwidth.php
@@ -30,7 +30,6 @@ defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
- 'note_add_language_string',
'default'
);
diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php
index ff3c7fd86..67dfa2a56 100644
--- a/admin/layouts/site_view/details_left.php
+++ b/admin/layouts/site_view/details_left.php
@@ -33,8 +33,9 @@ $fields = $displayData->get('fields') ?: array(
'name',
'codename',
'description',
- 'snippet',
- 'note_snippet_usage'
+ 'note_libraries_selection',
+ 'libraries',
+ 'note_add_language_string'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();
diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php
index 4665583e1..d5039e115 100644
--- a/admin/layouts/site_view/details_right.php
+++ b/admin/layouts/site_view/details_right.php
@@ -30,7 +30,9 @@ defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
- 'note_uikit_snippet'
+ 'snippet',
+ 'note_uikit_snippet',
+ 'note_snippet_usage'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();
diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php
index 682164c24..f8b5ac35b 100644
--- a/admin/layouts/template/details_fullwidth.php
+++ b/admin/layouts/template/details_fullwidth.php
@@ -30,7 +30,6 @@ defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
- 'note_add_language_string',
'template'
);
diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php
index 35ea371dc..352879ab6 100644
--- a/admin/layouts/template/details_left.php
+++ b/admin/layouts/template/details_left.php
@@ -33,8 +33,9 @@ $fields = $displayData->get('fields') ?: array(
'name',
'alias',
'description',
- 'snippet',
- 'note_snippet_usage'
+ 'note_libraries_selection',
+ 'libraries',
+ 'note_add_language_string'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();
diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php
index 4665583e1..d5039e115 100644
--- a/admin/layouts/template/details_right.php
+++ b/admin/layouts/template/details_right.php
@@ -30,7 +30,9 @@ defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
- 'note_uikit_snippet'
+ 'snippet',
+ 'note_uikit_snippet',
+ 'note_snippet_usage'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();
diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php
index e12ddf256..1027be741 100644
--- a/admin/models/admin_fields.php
+++ b/admin/models/admin_fields.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php
index 51ba6843c..147f91bd9 100644
--- a/admin/models/admin_fields_conditions.php
+++ b/admin/models/admin_fields_conditions.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index 1e3eb3c26..395766bba 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -84,7 +84,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index c474abcd9..f5736e200 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -211,6 +211,8 @@ class ComponentbuilderModelAjax extends JModelList
}
protected $buttonArray = array(
+ 'library_config' => 'libraries_config',
+ 'library_files_folders_urls' => 'libraries_files_folders_urls',
'admin_fields' => 'admins_fields',
'admin_fields_conditions' => 'admins_fields_conditions',
'field' => 'fields',
@@ -338,6 +340,10 @@ class ComponentbuilderModelAjax extends JModelList
}
protected $functionArray = array(
+ // Library
+ 'rename' => 'setYesNo',
+ 'update' => 'setYesNo',
+ 'type' => 'setURLType',
// Admin View
'field' => 'setItemNames',
'list' => 'setYesNo',
@@ -379,6 +385,10 @@ class ComponentbuilderModelAjax extends JModelList
protected function getLanguage($key)
{
$language = array(
+ // Library (folder file url)
+ 'rename' => JText::_('COM_COMPONENTBUILDER_RENAME'),
+ 'path' => JText::_('COM_COMPONENTBUILDER_TARGET_PATH'),
+ 'update' => JText::_('COM_COMPONENTBUILDER_UPDATE'),
// Admin View (fields)
'field' => JText::_('COM_COMPONENTBUILDER_FIELD'),
'list' => JText::_('COM_COMPONENTBUILDER_ADMIN_LIST'),
@@ -546,11 +556,17 @@ class ComponentbuilderModelAjax extends JModelList
protected $ref;
protected $fieldsArray = array(
+ 'library_config' => 'addconfig',
+ 'library_files_folders_urls' => array('addurls','addfiles','addfolders'),
'admin_fields' => 'addfields',
'admin_fields_conditions' => 'addconditions',
'component_admin_views' => 'addadmin_views',
'component_site_views' => 'addsite_views',
'component_custom_admin_views' => 'addcustom_admin_views');
+ protected $allowedViewsArray = array(
+ 'admin_view',
+ 'joomla_component',
+ 'library');
public function getAjaxDisplay($type)
{
@@ -561,28 +577,39 @@ class ComponentbuilderModelAjax extends JModelList
// get the view name & id
$values = $this->getViewID();
// check if we are in the correct view.
- if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']) && ($values['a_view'] === 'admin_view' || $values['a_view'] === 'joomla_component'))
+ if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']) && in_array($values['a_view'], $this->allowedViewsArray))
{
$this->ref = '&ref=' . $values['a_view'] . '&refid=' . $values['a_id'];
- // get the field data
- if ($fieldsData = ComponentbuilderHelper::getVar($type, (int) $values['a_id'], $values['a_view'], $this->fieldsArray[$type]))
+ // load the results
+ $result = array();
+ // return field table
+ if (ComponentbuilderHelper::checkArray($this->fieldsArray[$type]))
{
- // check repeatable conversion
- $this->checkRepeatableConversion($fieldsData, $type, $values['a_id'], $values['a_view']);
- // get the table
- $table = $this->getSubformTable($type, $fieldsData);
- // set notice of bad practice
- $notice = '';
- if ($values['a_view'] === 'admin_view' && isset($this->rowNumber) && $this->rowNumber > 50)
+ foreach ($this->fieldsArray[$type] as $fieldName)
{
- $notice = '
+
+
+
+ getLabel($field); ?>
+
+
+ getInput($field); ?>
+
+ ' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S', $this->rowNumber, $typeName, $typeName, $typeName, $typeName) . '
';
+ if ($table = $this->getFieldTable($type, $values['a_id'], $values['a_view'], $fieldName, $typeName))
+ {
+ $result[] = $table;
+ }
}
- elseif ($values['a_view'] === 'admin_view' && isset($this->rowNumber))
+ }
+ elseif (ComponentbuilderHelper::checkString($this->fieldsArray[$type]))
+ {
+ if ($table = $this->getFieldTable($type, $values['a_id'], $values['a_view'], $this->fieldsArray[$type], $typeName))
{
- $notice = '' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE', $this->rowNumber, $typeName, $typeName) . '
';
+ $result[] = $table;
}
- // return table
- return $notice.$table;
+ }
+ // check if we have results
+ if (ComponentbuilderHelper::checkArray($result) && count($result) == 1)
+ {
+ // return the display
+ return implode('', $result);
+ }
+ elseif (ComponentbuilderHelper::checkArray($result))
+ {
+ // return the display
+ return '' . implode('
', $result) . '
';
}
}
return '' . JText::sprintf('COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE', $typeName) . '
' . JText::_('COM_COMPONENTBUILDER_TYPE_ERROR') . '
' . JText::_('COM_COMPONENTBUILDER_THERE_HAS_BEEN_AN_ERROR_IF_THIS_CONTINUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR_OF_A_TYPE_ERROR_IN_THE_FIELDS_DISPLAY_REQUEST') . '
' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S', $this->rowNumber, $typeName, $typeName, $typeName, $typeName) . '
';
+ }
+ elseif ($idName === 'admin_view' && isset($this->rowNumber))
+ {
+ $notice = '' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE', $this->rowNumber, $typeName, $typeName) . '
';
+ }
+ // return table
+ return $notice.$table;
+ }
+ return false;
+ }
+
protected $conversionCheck = array(
'addfields' => 'field',
'addconditions' => 'target_field',
@@ -601,26 +653,26 @@ class ComponentbuilderModelAjax extends JModelList
'sql_tweak' => 'adminview',
'version_update' => 'version');
- protected function checkRepeatableConversion(&$fieldsData, $type, $id, $linked_id_name)
+ protected function checkRepeatableConversion(&$fieldsData, $fieldsArrayType, $id, $linked_id_name)
{
- if (ComponentbuilderHelper::checkJson($fieldsData))
+ if (ComponentbuilderHelper::checkJson($fieldsData) && isset($this->conversionCheck[$fieldsArrayType]))
{
$fieldsData = json_decode($fieldsData, true);
- if (isset($fieldsData[$this->conversionCheck[$this->fieldsArray[$type]]]))
+ if (isset($fieldsData[$this->conversionCheck[$fieldsArrayType]]))
{
$bucket = array();
foreach($fieldsData as $option => $values)
{
foreach($values as $nr => $value)
{
- $bucket[$this->fieldsArray[$type].$nr][$option] = $value;
+ $bucket[$fieldsArrayType.$nr][$option] = $value;
}
}
$fieldsData = json_encode($bucket);
// update the fields
$objectUpdate = new stdClass();
$objectUpdate->{$linked_id_name} = (int) $id;
- $objectUpdate->{$this->fieldsArray[$type]} = $fieldsData;
+ $objectUpdate->{$fieldsArrayType} = $fieldsData;
JFactory::getDbo()->updateObject('#__componentbuilder_'.$type, $objectUpdate, 'admin_view');
}
}
@@ -715,6 +767,23 @@ class ComponentbuilderModelAjax extends JModelList
return JText::_('COM_COMPONENTBUILDER_NO_ITEM_FOUND');
}
+ protected function setURLType($header, $value)
+ {
+ switch ($value)
+ {
+ case 1:
+ return JText::_('COM_COMPONENTBUILDER_DEFAULT_LINK');
+ break;
+ case 2:
+ return JText::_('COM_COMPONENTBUILDER_LOCAL_GET');
+ break;
+ case 3:
+ return JText::_('COM_COMPONENTBUILDER_LINK_LOCAL_DYNAMIC');
+ break;
+ }
+ return JText::_('COM_COMPONENTBUILDER_NOT_SET');
+ }
+
protected function setIcoMoon($header, $value)
{
if (ComponentbuilderHelper::checkString($value))
@@ -1003,6 +1072,39 @@ class ComponentbuilderModelAjax extends JModelList
return false;
}
+ // Used in site_view
+
+ public function getSnippets($libraries)
+ {
+ if (ComponentbuilderHelper::checkJson($libraries))
+ {
+ $libraries = json_decode($libraries, true);
+ }
+ // check if we have an array
+ if (ComponentbuilderHelper::checkArray($libraries))
+ {
+ // insure we only have int values
+ $libraries = array_map( function($id){ return (int) $id; }, $libraries);
+ // Get a db connection.
+ $db = JFactory::getDbo();
+ // Create a new query object.
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName( array('a.id') ));
+ $query->from($db->quoteName('#__componentbuilder_snippet', 'a'));
+ $query->where($db->quoteName('a.published') . ' = 1');
+ // check for country and region
+ $query->where($db->quoteName('a.library') . ' IN ('. implode(',',$libraries) .')');
+ $db->setQuery($query);
+ $db->execute();
+ if ($db->getNumRows())
+ {
+ return $db->loadColumn();
+ }
+ }
+ return false;
+ }
+
+
// Used in template
public function getTemplateDetails($id)
{
diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php
index d0a7acf18..2ca81fed2 100644
--- a/admin/models/component_admin_views.php
+++ b/admin/models/component_admin_views.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/component_config.php b/admin/models/component_config.php
index 4fa5e7b26..5c2fd0bb4 100644
--- a/admin/models/component_config.php
+++ b/admin/models/component_config.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/component_custom_admin_menus.php b/admin/models/component_custom_admin_menus.php
index e7932e9e1..8c5900497 100644
--- a/admin/models/component_custom_admin_menus.php
+++ b/admin/models/component_custom_admin_menus.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php
index b8f91cbac..7046d87c5 100644
--- a/admin/models/component_custom_admin_views.php
+++ b/admin/models/component_custom_admin_views.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php
index f25db9e09..a23ff3456 100644
--- a/admin/models/component_dashboard.php
+++ b/admin/models/component_dashboard.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/component_files_folders.php b/admin/models/component_files_folders.php
index b6d2db167..a01e64894 100644
--- a/admin/models/component_files_folders.php
+++ b/admin/models/component_files_folders.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/component_mysql_tweaks.php b/admin/models/component_mysql_tweaks.php
index 3d7148880..dbf351d42 100644
--- a/admin/models/component_mysql_tweaks.php
+++ b/admin/models/component_mysql_tweaks.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php
index 25170119f..3ac82dcb3 100644
--- a/admin/models/component_site_views.php
+++ b/admin/models/component_site_views.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/component_updates.php b/admin/models/component_updates.php
index 36e30aaeb..a3b4df547 100644
--- a/admin/models/component_updates.php
+++ b/admin/models/component_updates.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index 03f328d15..1f40523fe 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -43,7 +43,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
$icons = array();
// view groups array
$viewGroups = array(
- 'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.snippet.add', 'png.snippets', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.ftps', 'png.help_document.add', 'png.help_documents')
+ 'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.libraries', 'png.snippet.add', 'png.snippets', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.ftps', 'png.help_document.add', 'png.help_documents')
);
// view access array
$viewAccess = array(
@@ -92,6 +92,11 @@ class ComponentbuilderModelComponentbuilder extends JModelList
'custom_code.access' => 'custom_code.access',
'custom_codes.submenu' => 'custom_code.submenu',
'custom_codes.dashboard_list' => 'custom_code.dashboard_list',
+ 'library.create' => 'library.create',
+ 'libraries.access' => 'library.access',
+ 'library.access' => 'library.access',
+ 'libraries.submenu' => 'library.submenu',
+ 'libraries.dashboard_list' => 'library.dashboard_list',
'snippets.access' => 'snippet.access',
'snippet.access' => 'snippet.access',
'snippets.submenu' => 'snippet.submenu',
@@ -165,9 +170,12 @@ class ComponentbuilderModelComponentbuilder extends JModelList
'snippet_type.create' => 'snippet_type.create',
'snippet_types.access' => 'snippet_type.access',
'snippet_type.access' => 'snippet_type.access',
- 'library.create' => 'library.create',
- 'libraries.access' => 'library.access',
- 'library.access' => 'library.access');
+ 'library_config.create' => 'library_config.create',
+ 'libraries_config.access' => 'library_config.access',
+ 'library_config.access' => 'library_config.access',
+ 'library_files_folders_urls.create' => 'library_files_folders_urls.create',
+ 'libraries_files_folders_urls.access' => 'library_files_folders_urls.access',
+ 'library_files_folders_urls.access' => 'library_files_folders_urls.access');
foreach($viewGroups as $group => $views)
{
$i = 0;
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index 18cbbf214..138b84f24 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
@@ -95,12 +95,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->metadata = $registry->toArray();
}
- if (!empty($item->custom_get))
+ if (!empty($item->libraries))
{
- // Convert the custom_get field to an array.
- $custom_get = new Registry;
- $custom_get->loadString($item->custom_get);
- $item->custom_get = $custom_get->toArray();
+ // Convert the libraries field to an array.
+ $libraries = new Registry;
+ $libraries->loadString($item->libraries);
+ $item->libraries = $libraries->toArray();
}
if (!empty($item->custom_button))
@@ -111,6 +111,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->custom_button = $custom_button->toArray();
}
+ if (!empty($item->custom_get))
+ {
+ // Convert the custom_get field to an array.
+ $custom_get = new Registry;
+ $custom_get->loadString($item->custom_get);
+ $item->custom_get = $custom_get->toArray();
+ }
+
if (!empty($item->php_controller))
{
// base64 Decode php_controller.
@@ -915,17 +923,17 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['metadata'] = (string) $metadata;
}
- // Set the custom_get items to data.
- if (isset($data['custom_get']) && is_array($data['custom_get']))
+ // Set the libraries items to data.
+ if (isset($data['libraries']) && is_array($data['libraries']))
{
- $custom_get = new JRegistry;
- $custom_get->loadArray($data['custom_get']);
- $data['custom_get'] = (string) $custom_get;
+ $libraries = new JRegistry;
+ $libraries->loadArray($data['libraries']);
+ $data['libraries'] = (string) $libraries;
}
- elseif (!isset($data['custom_get']))
+ elseif (!isset($data['libraries']))
{
- // Set the empty custom_get to data
- $data['custom_get'] = '';
+ // Set the empty libraries to data
+ $data['libraries'] = '';
}
// Set the custom_button items to data.
@@ -941,6 +949,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['custom_button'] = '';
}
+ // Set the custom_get items to data.
+ if (isset($data['custom_get']) && is_array($data['custom_get']))
+ {
+ $custom_get = new JRegistry;
+ $custom_get->loadArray($data['custom_get']);
+ $data['custom_get'] = (string) $custom_get;
+ }
+ elseif (!isset($data['custom_get']))
+ {
+ // Set the empty custom_get to data
+ $data['custom_get'] = '';
+ }
+
// Set the php_controller string to base64 string.
if (isset($data['php_controller']))
{
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index 74ee3fe32..074986b1a 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index bb8b6bb43..17483f157 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/field.php b/admin/models/field.php
index c8b932bbb..a057ede2a 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelField extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
diff --git a/admin/models/fields/adminviewsreadonly.php b/admin/models/fields/adminviewsreadonly.php
new file mode 100644
index 000000000..ff5e67b1c
--- /dev/null
+++ b/admin/models/fields/adminviewsreadonly.php
@@ -0,0 +1,170 @@
+
+ @github Joomla Component Builder ' .$html . implode('',$button).'
';
+ }
+ }
+ return $html;
+ }
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of JHtml options.
+ */
+ public function getOptions()
+ {
+ $db = JFactory::getDBO();
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('a.id','a.system_name'),array('id','admin_view_system_name')));
+ $query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
+ $query->order('a.system_name ASC');
+ $db->setQuery((string)$query);
+ $items = $db->loadObjectList();
+ $options = array();
+ if ($items)
+ {
+ $options[] = JHtml::_('select.option', '', 'Select an option');
+ foreach($items as $item)
+ {
+ $options[] = JHtml::_('select.option', $item->id, $item->admin_view_system_name);
+ }
+ }
+ return $options;
+ }
+}
diff --git a/admin/models/fields/joomlacomponents.php b/admin/models/fields/joomlacomponents.php
index 2401e1bc8..76db53a39 100644
--- a/admin/models/fields/joomlacomponents.php
+++ b/admin/models/fields/joomlacomponents.php
@@ -153,7 +153,6 @@ class JFormFieldJoomlacomponents extends JFormFieldList
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.system_name'),array('id','joomla_component_system_name')));
$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
- $query->where($db->quoteName('a.published') . ' >= 1');
$query->order('a.system_name ASC');
$db->setQuery((string)$query);
$items = $db->loadObjectList();
diff --git a/admin/models/fields/libconfigfield.php b/admin/models/fields/libconfigfield.php
new file mode 100644
index 000000000..61674254b
--- /dev/null
+++ b/admin/models/fields/libconfigfield.php
@@ -0,0 +1,206 @@
+
+ @github Joomla Component Builder ' .$html . implode('',$button).'
';
+ }
+ }
+ return $html;
+ }
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of JHtml options.
+ */
+ public function getOptions()
+ {
+ // load the db opbject
+ $db = JFactory::getDBO();
+ // get the input from url
+ $jinput = JFactory::getApplication()->input;
+ // get the id
+ $ID = $jinput->getInt('id', 0);
+ // rest the fields ids
+ $fieldIds = array();
+ if (is_numeric($ID) && $ID >= 1)
+ {
+ // get all the fields linked to the library config
+ if ($addconfig = ComponentbuilderHelper::getVar('library_config', (int) $ID, 'library', 'addconfig'))
+ {
+ if (ComponentbuilderHelper::checkJson($addconfig))
+ {
+ $addconfig = json_decode($addconfig, true);
+ if (ComponentbuilderHelper::checkArray($addconfig))
+ {
+ foreach($addconfig as $field)
+ {
+ if (isset($field['field']))
+ {
+ $fieldIds[] = (int) $field['field'];
+ }
+ }
+ }
+ }
+ }
+ }
+ // check if we have ids, since we should not show any fields that are not part of this config
+ if (ComponentbuilderHelper::checkArray($fieldIds))
+ {
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('a.id','a.name'),array('id','name')));
+ $query->from($db->quoteName('#__componentbuilder_field', 'a'));
+ $query->where($db->quoteName('a.published') . ' >= 1');
+ // only load these fields
+ $query->where($db->quoteName('a.id') . ' IN (' . implode(',', $fieldIds) . ')');
+ $query->order('a.name ASC');
+ $db->setQuery((string)$query);
+ $items = $db->loadObjectList();
+ $options = array();
+ if ($items)
+ {
+ $options[] = JHtml::_('select.option', '', 'Select an option');
+ foreach($items as $item)
+ {
+ $options[] = JHtml::_('select.option', $item->id, $item->name);
+ }
+ return $options;
+ }
+ }
+ return array(JHtml::_('select.option', '', 'No config fields linked'));
+ }
+}
diff --git a/admin/models/fields/libraries.php b/admin/models/fields/libraries.php
new file mode 100644
index 000000000..9eda09545
--- /dev/null
+++ b/admin/models/fields/libraries.php
@@ -0,0 +1,170 @@
+
+ @github Joomla Component Builder ' .$html . implode('',$button).'
';
+ }
+ }
+ return $html;
+ }
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of JHtml options.
+ */
+ public function getOptions()
+ {
+ $db = JFactory::getDBO();
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('a.id','a.name'),array('id','libraries_name')));
+ $query->from($db->quoteName('#__componentbuilder_library', 'a'));
+ $query->where($db->quoteName('a.published') . ' >= 1');
+ $query->order('a.name ASC');
+ $db->setQuery((string)$query);
+ $items = $db->loadObjectList();
+ $options = array();
+ if ($items)
+ {
+ foreach($items as $item)
+ {
+ $options[] = JHtml::_('select.option', $item->id, $item->libraries_name);
+ }
+ }
+ return $options;
+ }
+}
diff --git a/admin/models/fields/libraryfiles.php b/admin/models/fields/libraryfiles.php
new file mode 100644
index 000000000..747d71611
--- /dev/null
+++ b/admin/models/fields/libraryfiles.php
@@ -0,0 +1,171 @@
+
+ @github Joomla Component Builder ' .$html . implode('',$button).'
';
+ }
+ }
+ return $html;
+ }
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of JHtml options.
+ */
+ public function getOptions()
+ {
+ // get the input from url
+ $jinput = JFactory::getApplication()->input;
+ // get the library id
+ $id = $jinput->getInt('id', 0);
+ // get custom the files
+ $files = ComponentbuilderHelper::getLibraryFiles($id);
+ // set the default
+ $options[] = JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_NO_FILES_LINKED'));
+ // now check if there are files in the folder
+ if (ComponentbuilderHelper::checkArray($files))
+ {
+ $options = array();
+ foreach ($files as $file => $name)
+ {
+ $options[] = JHtml::_('select.option', $file, $name);
+ }
+ }
+ return $options;
+ }
+}
diff --git a/admin/models/fields/libraryreadonly.php b/admin/models/fields/libraryreadonly.php
new file mode 100644
index 000000000..71c7099b6
--- /dev/null
+++ b/admin/models/fields/libraryreadonly.php
@@ -0,0 +1,170 @@
+
+ @github Joomla Component Builder ' .$html . implode('',$button).'
';
+ }
+ }
+ return $html;
+ }
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of JHtml options.
+ */
+ public function getOptions()
+ {
+ $db = JFactory::getDBO();
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('a.id','a.name'),array('id','library_name')));
+ $query->from($db->quoteName('#__componentbuilder_library', 'a'));
+ $query->order('a.name ASC');
+ $db->setQuery((string)$query);
+ $items = $db->loadObjectList();
+ $options = array();
+ if ($items)
+ {
+ $options[] = JHtml::_('select.option', '', 'Select an option');
+ foreach($items as $item)
+ {
+ $options[] = JHtml::_('select.option', $item->id, $item->library_name);
+ }
+ }
+ return $options;
+ }
+}
diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php
index e0495c20d..86f27c189 100644
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -165,11 +165,11 @@ class JFormFieldSnippets extends JFormFieldList
$options = array();
if ($items)
{
- $options[] = JHtml::_('select.option', '', 'Select an option');
foreach($items as $item)
{
- $lib = (ComponentbuilderHelper::checkString($item->library)) ? ' (' . $item->library . ')' :'';
- $options[] = JHtml::_('select.option', $item->id, $item->type . ' - ' . $item->snippet_name . $lib );
+ $lib = (isset($item->library) && ComponentbuilderHelper::checkString($item->library)) ? ' (' . $item->library . ')' :'';
+ $type = (isset($item->type) && ComponentbuilderHelper::checkString($item->type)) ? $item->type :JText::_('COM_COMPONENTBUILDER_NO_TYPE');
+ $options[] = JHtml::_('select.option', $item->id, $type . ' - ' . $item->snippet_name . $lib );
}
}
return $options;
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 592749075..b7a7378e4 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -79,7 +79,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
- if (!empty($item->params))
+ if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
@@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getVzufields()
+ public function getVzwfields()
{
// Get the user object.
$user = JFactory::getUser();
@@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert datatype
- $item->datatype = $this->selectionTranslationVzufields($item->datatype, 'datatype');
+ $item->datatype = $this->selectionTranslationVzwfields($item->datatype, 'datatype');
// convert indexes
- $item->indexes = $this->selectionTranslationVzufields($item->indexes, 'indexes');
+ $item->indexes = $this->selectionTranslationVzwfields($item->indexes, 'indexes');
// convert null_switch
- $item->null_switch = $this->selectionTranslationVzufields($item->null_switch, 'null_switch');
+ $item->null_switch = $this->selectionTranslationVzwfields($item->null_switch, 'null_switch');
// convert store
- $item->store = $this->selectionTranslationVzufields($item->store, 'store');
+ $item->store = $this->selectionTranslationVzwfields($item->store, 'store');
}
}
@@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return translatable string
*/
- public function selectionTranslationVzufields($value,$name)
+ public function selectionTranslationVzwfields($value,$name)
{
// Array of datatype language strings
if ($name === 'datatype')
diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml
index 032492169..248a5bd94 100644
--- a/admin/models/forms/admin_fields.xml
+++ b/admin/models/forms/admin_fields.xml
@@ -90,9 +90,9 @@
filter="unset"
/>
-
+
escape($item->library_name); ?>
+
Component Builder (v.2.6.6)
The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. @@ -81,6 +81,7 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo
+ diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml index ab62f5746..9f0c7ba47 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -254,4 +254,21 @@
-