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

Fixed a few bugs in connection to v2.6.0 and also made a few tweaks to the fields field

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-11-03 01:41:32 +02:00
parent f85925c933
commit 0976f79940
302 changed files with 631 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/models/admin_view.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 247 of this MVC
@build 30th October, 2017
@version @update number 250 of this MVC
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.php

4
admin/models/admin_views.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 247 of this MVC
@build 30th October, 2017
@version @update number 250 of this MVC
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage admin_views.php

28
admin/models/ajax.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage ajax.php
@ -635,9 +635,9 @@ class ComponentbuilderModelAjax extends JModelList
protected $itemKeys = array(
// admin view
'field' => array('table' => 'field', 'tables' => 'fields', 'id' => 'id', 'name' => 'name', 'text' => 'Field'),
'target_field' => array('table' => 'field', 'tables' => 'fields', 'id' => 'id', 'name' => 'name', 'text' => 'Field'),
'match_field' => array('table' => 'field', 'tables' => 'fields', 'id' => 'id', 'name' => 'name', 'text' => 'Field'),
'field' => array('table' => 'field', 'tables' => 'fields', 'id' => 'id', 'name' => 'name', 'text' => 'Field', 'type' => array('table' => 'fieldtype', 'field' => 'id', 'key' => 'fieldtype', 'get' => 'name')),
'target_field' => array('table' => 'field', 'tables' => 'fields', 'id' => 'id', 'name' => 'name', 'text' => 'Field', 'type' => array('table' => 'fieldtype', 'field' => 'id', 'key' => 'fieldtype', 'get' => 'name')),
'match_field' => array('table' => 'field', 'tables' => 'fields', 'id' => 'id', 'name' => 'name', 'text' => 'Field', 'type' => array('table' => 'fieldtype', 'field' => 'id', 'key' => 'fieldtype', 'get' => 'name')),
// joomla component view
'siteview' => array('table' => 'site_view', 'tables' => 'site_views', 'id' => 'id', 'name' => 'name', 'text' => 'Site View'),
'customadminview' => array('table' => 'custom_admin_view', 'tables' => 'custom_admin_views', 'id' => 'id', 'name' => 'system_name', 'text' => 'Custom Admin View'),
@ -664,6 +664,15 @@ class ComponentbuilderModelAjax extends JModelList
$this->itemNames[$this->itemKeys[$header]['table']][$item] = JText::sprintf('COM_COMPONENTBUILDER_NO_S_FOUND', $this->itemKeys[$header]['text']);
$edit = false;
}
// check if we should load a type
if ($edit && isset($this->itemKeys[$header]['type']) && ComponentbuilderHelper::checkArray($this->itemKeys[$header]['type']) && isset($this->itemKeys[$header]['type']['table']))
{
// get the linked value
if ($_key = ComponentbuilderHelper::getVar($this->itemKeys[$header]['table'], (int) $item, $this->itemKeys[$header]['id'], $this->itemKeys[$header]['type']['key']))
{
$this->itemNames[$this->itemKeys[$header]['table']][$item] .= ' [' . ComponentbuilderHelper::getVar($this->itemKeys[$header]['type']['table'], (int) $_key, $this->itemKeys[$header]['type']['field'], $this->itemKeys[$header]['type']['get']) .']';
}
}
}
// set edit link
$link = ($edit) ? $this->addEditLink($item, $this->itemKeys[$header]['table'], $this->itemKeys[$header]['tables']) : '';
@ -681,6 +690,15 @@ class ComponentbuilderModelAjax extends JModelList
$this->itemNames[$this->itemKeys[$header]['table']][$value] = JText::sprintf('COM_COMPONENTBUILDER_NO_S_FOUND', $this->itemKeys[$header]['text']);
$edit = false;
}
// check if we should load a type
if ($edit && isset($this->itemKeys[$header]['type']) && ComponentbuilderHelper::checkArray($this->itemKeys[$header]['type']) && isset($this->itemKeys[$header]['type']['table']))
{
// get the linked value
if ($_key = ComponentbuilderHelper::getVar($this->itemKeys[$header]['table'], (int) $value, $this->itemKeys[$header]['id'], $this->itemKeys[$header]['type']['key']))
{
$this->itemNames[$this->itemKeys[$header]['table']][$value] .= ' [' . ComponentbuilderHelper::getVar($this->itemKeys[$header]['type']['table'], (int) $_key, $this->itemKeys[$header]['type']['field'], $this->itemKeys[$header]['type']['get']) .']';
}
}
}
// set edit link
$link = ($edit) ? $this->addEditLink($value, $this->itemKeys[$header]['table'], $this->itemKeys[$header]['tables']) : '';

2
admin/models/component_dashboard.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 5 of this MVC
@build 29th October, 2017
@build 2nd November, 2017
@created 26th October, 2017
@package Component Builder
@subpackage component_dashboard.php

4
admin/models/componentbuilder.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

2
admin/models/components_dashboard.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 5 of this MVC
@build 29th October, 2017
@build 2nd November, 2017
@created 26th October, 2017
@package Component Builder
@subpackage components_dashboard.php

4
admin/models/fields/adminsviews.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminsviews.php

4
admin/models/fields/adminviewfolderlist.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviewfolderlist.php

4
admin/models/fields/adminviews.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviews.php

4
admin/models/fields/articles.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage articles.php

4
admin/models/fields/component.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage component.php

4
admin/models/fields/componentadminmenus.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentadminmenus.php

4
admin/models/fields/componentadminviews.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentadminviews.php

4
admin/models/fields/components.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage components.php

4
admin/models/fields/customadminviews.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customadminviews.php

4
admin/models/fields/customfilelist.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfilelist.php

4
admin/models/fields/customfolderlist.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfolderlist.php

4
admin/models/fields/customgets.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customgets.php

4
admin/models/fields/dbtables.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dbtables.php

4
admin/models/fields/dynamicget.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dynamicget.php

4
admin/models/fields/dynamicgets.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dynamicgets.php

11
admin/models/fields/fields.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.php
@ -151,8 +151,9 @@ class JFormFieldFields extends JFormFieldList
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.name'),array('id','field_name')));
$query->from($db->quoteName('#__componentbuilder_field', 'a'));
$query->select($db->quoteName(array('a.id','a.name','b.name'),array('id','field_name','type')));
$query->from($db->quoteName('#__componentbuilder_field', 'a'));
$query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.id = a.fieldtype');
$query->where($db->quoteName('a.published') . ' >= 1');
$query->order('a.name ASC');
$db->setQuery((string)$query);
@ -163,7 +164,7 @@ class JFormFieldFields extends JFormFieldList
$options[] = JHtml::_('select.option', '', 'Select an option');
foreach($items as $item)
{
$options[] = JHtml::_('select.option', $item->id, $item->field_name);
$options[] = JHtml::_('select.option', $item->id, $item->field_name . ' [' . $item->type . ']');
}
}
return $options;

4
admin/models/fields/fieldtypes.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php

4
admin/models/fields/joomlacomponents.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage joomlacomponents.php

4
admin/models/fields/lang.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage lang.php

4
admin/models/fields/maingets.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage maingets.php

4
admin/models/fields/matchfield.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage matchfield.php

4
admin/models/fields/siteviewfolderlist.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviewfolderlist.php

4
admin/models/fields/siteviews.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviews.php

4
admin/models/fields/snippets.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php

4
admin/models/fields/targetfields.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage targetfields.php

4
admin/models/fields/viewtabs.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage viewtabs.php

4
admin/models/forms/admin_view.js
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 247 of this MVC
@build 30th October, 2017
@version @update number 250 of this MVC
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.js

2
admin/models/forms/component_dashboard.js
View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 5 of this MVC
@build 29th October, 2017
@build 2nd November, 2017
@created 26th October, 2017
@package Component Builder
@subpackage component_dashboard.js

2
admin/models/forms/component_dashboard.xml
View File

@ -113,7 +113,7 @@
class="text_area span12"
filter="raw"
hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_HINT"
required="true"
required="false"
/>
<!-- Dashboard_tab Field. Type: Subform. (joomla) -->
<field

4
admin/models/import.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage import.php

4
admin/models/import_joomla_components.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage import_joomla_components.php