Change the field name form type to fieldtype in the field view.

This commit is contained in:
2016-03-04 02:01:43 +02:00
parent 3efbb7b4af
commit 80670beada
369 changed files with 951 additions and 946 deletions

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.php
@ -237,8 +237,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$query->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON (' . $db->quoteName('a.catid') . ' = ' . $db->quoteName('c.id') . ')');
// From the componentbuilder_fieldtype table.
$query->select($db->quoteName('g.name','type_name'));
$query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.type') . ' = ' . $db->quoteName('g.id') . ')');
$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') . ')');
// Join over the asset groups.
$query->select('ag.title AS access_level');

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_views.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage ajax.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage compiler.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage component.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage components.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_view.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_views.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_get.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_gets.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage field.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fields.php
@ -46,7 +46,7 @@ class ComponentbuilderModelFields extends JModelList
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.name','name',
'a.type','type',
'a.fieldtype','fieldtype',
'a.datatype','datatype',
'a.indexes','indexes',
'a.null_switch','null_switch',
@ -77,8 +77,8 @@ class ComponentbuilderModelFields extends JModelList
$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
$this->setState('filter.name', $name);
$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
$this->setState('filter.type', $type);
$fieldtype = $this->getUserStateFromRequest($this->context . '.filter.fieldtype', 'filter_fieldtype');
$this->setState('filter.fieldtype', $fieldtype);
$datatype = $this->getUserStateFromRequest($this->context . '.filter.datatype', 'filter_datatype');
$this->setState('filter.datatype', $datatype);
@ -273,8 +273,8 @@ class ComponentbuilderModelFields extends JModelList
$query->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON (' . $db->quoteName('a.catid') . ' = ' . $db->quoteName('c.id') . ')');
// From the componentbuilder_fieldtype table.
$query->select($db->quoteName('g.name','type_name'));
$query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.type') . ' = ' . $db->quoteName('g.id') . ')');
$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 published state
$published = $this->getState('filter.published');
@ -312,14 +312,14 @@ class ComponentbuilderModelFields extends JModelList
else
{
$search = $db->quote('%' . $db->escape($search, true) . '%');
$query->where('(a.name LIKE '.$search.' OR a.type LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.')');
$query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.')');
}
}
// Filter by type.
if ($type = $this->getState('filter.type'))
// Filter by fieldtype.
if ($fieldtype = $this->getState('filter.fieldtype'))
{
$query->where('a.type = ' . $db->quote($db->escape($type, true)));
$query->where('a.fieldtype = ' . $db->quote($db->escape($fieldtype, true)));
}
// Filter by Datatype.
if ($datatype = $this->getState('filter.datatype'))
@ -497,7 +497,7 @@ class ComponentbuilderModelFields extends JModelList
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.fieldtype');
$id .= ':' . $this->getState('filter.datatype');
$id .= ':' . $this->getState('filter.indexes');
$id .= ':' . $this->getState('filter.null_switch');

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage adminviews.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage articles.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage customadminviews.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage customfilelist.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage customfolderlist.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage customgets.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dbtables.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamicgets.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fields.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldsmulti.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php
@ -96,7 +96,7 @@ class JFormFieldFieldtypes extends JFormFieldList
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.name'),array('id','type_name')));
$query->select($db->quoteName(array('a.id','a.name'),array('id','fieldtype_name')));
$query->from($db->quoteName('#__componentbuilder_fieldtype', 'a'));
$query->where($db->quoteName('a.published') . ' = 1');
$query->order('a.name ASC');
@ -108,7 +108,7 @@ class JFormFieldFieldtypes extends JFormFieldList
$options[] = JHtml::_('select.option', '', 'Select an option');
foreach($items as $item)
{
$options[] = JHtml::_('select.option', $item->id, $item->type_name);
$options[] = JHtml::_('select.option', $item->id, $item->fieldtype_name);
}
}
return $options;

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage maingets.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage siteviews.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtype.php
@ -102,7 +102,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
$item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype');
}
}
$this->typevvvy = $item->id;
$this->fieldtypevvvy = $item->id;
return $item;
}
@ -129,22 +129,22 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
$query->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON (' . $db->quoteName('a.catid') . ' = ' . $db->quoteName('c.id') . ')');
// From the componentbuilder_fieldtype table.
$query->select($db->quoteName('g.name','type_name'));
$query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.type') . ' = ' . $db->quoteName('g.id') . ')');
$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 typevvvy global.
$typevvvy = $this->typevvvy;
if (is_numeric($typevvvy ))
// Filter by fieldtypevvvy global.
$fieldtypevvvy = $this->fieldtypevvvy;
if (is_numeric($fieldtypevvvy ))
{
$query->where('a.type = ' . (int) $typevvvy );
$query->where('a.fieldtype = ' . (int) $fieldtypevvvy );
}
elseif (is_string($typevvvy))
elseif (is_string($fieldtypevvvy))
{
$query->where('a.type = ' . $db->quote($typevvvy));
$query->where('a.fieldtype = ' . $db->quote($fieldtypevvvy));
}
else
{
$query->where('a.type = -5');
$query->where('a.fieldtype = -5');
}
// Join over the asset groups.

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.js

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage component.js

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_view.js

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_get.js

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage field.js

View File

@ -99,12 +99,12 @@
message="Error! Please add name here."
hint="COM_COMPONENTBUILDER_FIELD_NAME_HINT"
/>
<!-- Type Field. Type: Fieldtypes. (custom) -->
<!-- Fieldtype Field. Type: Fieldtypes. (custom) -->
<field
type="fieldtypes"
name="type"
label="COM_COMPONENTBUILDER_FIELD_TYPE_LABEL"
description="COM_COMPONENTBUILDER_FIELD_TYPE_DESCRIPTION"
name="fieldtype"
label="COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL"
description="COM_COMPONENTBUILDER_FIELD_FIELDTYPE_DESCRIPTION"
class="btn-group"
multiple="false"
required="true"

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtype.js

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_document.js

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layout.js

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_view.js

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippet.js

View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage template.js

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_document.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_documents.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage import.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layout.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layouts.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_view.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_views.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippet.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage template.php

View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.1
@build 1st March, 2016
@version 2.1.2
@build 4th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage templates.php