Malachi/Component-Builder-fork
1
0
Fork 0
forked from joomla/Component-Builder
Code Pull Requests Activity

Fixed gh-417 edit layout by removing the one to many div's from the dynamic build method.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2019-06-10 01:05:37 +02:00
parent c966720f79
commit 6da9cb3d42
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
43 changed files with 622 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -150,7 +150,7 @@ TODO
+ *Version*: 2.9.18
+ *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **206669**
+ *Line count*: **206638**
+ *Field count*: **1136**
+ *File count*: **1344**
+ *Folder count*: **209**

2
admin/README.txt
View File

@ -150,7 +150,7 @@ TODO
+ *Version*: 2.9.18
+ *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **206669**
+ *Line count*: **206638**
+ *Field count*: **1136**
+ *File count*: **1344**
+ *Folder count*: **209**

795
admin/helpers/compiler/e_Interpretation.php
View File

File diff suppressed because it is too large Load Diff

1
admin/views/admin_custom_tabs/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/admin_fields/tmpl/edit.php
View File

@ -102,7 +102,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/admin_fields_conditions/tmpl/edit.php
View File

@ -102,7 +102,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/admin_fields_relations/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/admin_view/tmpl/edit.php
View File

@ -200,7 +200,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
<div class="clearfix"></div>
<?php echo JLayoutHelper::render('admin_view.details_under', $this); ?>

1
admin/views/component_admin_views/tmpl/edit.php
View File

@ -102,7 +102,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/component_config/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/component_custom_admin_menus/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/component_custom_admin_views/tmpl/edit.php
View File

@ -102,7 +102,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/component_dashboard/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/component_files_folders/tmpl/edit.php
View File

@ -112,6 +112,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/component_mysql_tweaks/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/component_placeholders/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/component_site_views/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/component_updates/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

4
admin/views/custom_admin_views/view.html.php
View File

@ -193,14 +193,14 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
// Set Main Get Name Selection
$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
// We do some sanitation for filter
// We do some sanitation for Main Get Name filter
if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) &&
isset($this->main_getNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
{
unset($this->main_getNameOptions[0]);
}
// Only load filter if it has values
// Only load Main Get Name filter if it has values
if (ComponentbuilderHelper::checkArray($this->main_getNameOptions))
{
// Main Get Name Filter

1
admin/views/custom_code/tmpl/edit.php
View File

@ -108,7 +108,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
<div class="clearfix"></div>
<?php echo JLayoutHelper::render('custom_code.details_under', $this); ?>

4
admin/views/custom_codes/view.html.php
View File

@ -193,14 +193,14 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
// Set Component System Name Selection
$this->componentSystem_nameOptions = JFormHelper::loadFieldType('Component')->options;
// We do some sanitation for filter
// We do some sanitation for Component System Name filter
if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions) &&
isset($this->componentSystem_nameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value))
{
unset($this->componentSystem_nameOptions[0]);
}
// Only load filter if it has values
// Only load Component System Name filter if it has values
if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions))
{
// Component System Name Filter

1
admin/views/dynamic_get/tmpl/edit.php
View File

@ -151,7 +151,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
<div class="clearfix"></div>
<?php echo JLayoutHelper::render('dynamic_get.main_under', $this); ?>

1
admin/views/field/tmpl/edit.php
View File

@ -139,7 +139,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
<div class="clearfix"></div>
<?php echo JLayoutHelper::render('field.set_properties_under', $this); ?>

4
admin/views/fields/view.html.php
View File

@ -210,14 +210,14 @@ class ComponentbuilderViewFields extends JViewLegacy
// Set Fieldtype Name Selection
$this->fieldtypeNameOptions = JFormHelper::loadFieldType('Fieldtypes')->options;
// We do some sanitation for filter
// We do some sanitation for Fieldtype Name filter
if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions) &&
isset($this->fieldtypeNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->fieldtypeNameOptions[0]->value))
{
unset($this->fieldtypeNameOptions[0]);
}
// Only load filter if it has values
// Only load Fieldtype Name filter if it has values
if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions))
{
// Fieldtype Name Filter

1
admin/views/fieldtype/tmpl/edit.php
View File

@ -131,7 +131,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/help_document/tmpl/edit.php
View File

@ -108,7 +108,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
<div class="clearfix"></div>
<?php echo JLayoutHelper::render('help_document.details_under', $this); ?>

8
admin/views/help_documents/view.html.php
View File

@ -248,14 +248,14 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
// Set Admin View Selection
$this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options;
// We do some sanitation for Location filter
// We do some sanitation for Admin View filter
if (ComponentbuilderHelper::checkArray($this->admin_viewOptions) &&
isset($this->admin_viewOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->admin_viewOptions[0]->value))
{
unset($this->admin_viewOptions[0]);
}
// Only load Location filter if it has values
// Only load Admin View filter if it has values
if (ComponentbuilderHelper::checkArray($this->admin_viewOptions))
{
// Admin View Filter
@ -278,14 +278,14 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
// Set Site View Selection
$this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options;
// We do some sanitation for Location filter
// We do some sanitation for Site View filter
if (ComponentbuilderHelper::checkArray($this->site_viewOptions) &&
isset($this->site_viewOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->site_viewOptions[0]->value))
{
unset($this->site_viewOptions[0]);
}
// Only load Location filter if it has values
// Only load Site View filter if it has values
if (ComponentbuilderHelper::checkArray($this->site_viewOptions))
{
// Site View Filter

1
admin/views/joomla_component/tmpl/edit.php
View File

@ -217,7 +217,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
<div class="clearfix"></div>
<?php echo JLayoutHelper::render('joomla_component.details_under', $this); ?>

1
admin/views/language/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/language_translation/tmpl/edit.php
View File

@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

4
admin/views/layouts/view.html.php
View File

@ -193,14 +193,14 @@ class ComponentbuilderViewLayouts extends JViewLegacy
// Set Dynamic Get Name Selection
$this->dynamic_getNameOptions = JFormHelper::loadFieldType('Dynamicget')->options;
// We do some sanitation for filter
// We do some sanitation for Dynamic Get Name filter
if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions) &&
isset($this->dynamic_getNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
{
unset($this->dynamic_getNameOptions[0]);
}
// Only load filter if it has values
// Only load Dynamic Get Name filter if it has values
if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions))
{
// Dynamic Get Name Filter

4
admin/views/libraries/view.html.php
View File

@ -183,14 +183,14 @@ class ComponentbuilderViewLibraries extends JViewLegacy
// Set How Selection
$this->howOptions = JFormHelper::loadFieldType('Filebehaviour')->options;
// We do some sanitation for filter
// We do some sanitation for How filter
if (ComponentbuilderHelper::checkArray($this->howOptions) &&
isset($this->howOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->howOptions[0]->value))
{
unset($this->howOptions[0]);
}
// Only load filter if it has values
// Only load How filter if it has values
if (ComponentbuilderHelper::checkArray($this->howOptions))
{
// How Filter

1
admin/views/library/tmpl/edit.php
View File

@ -138,7 +138,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
<div class="clearfix"></div>
<?php echo JLayoutHelper::render('library.behaviour_under', $this); ?>

1
admin/views/library_config/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/library_files_folders_urls/tmpl/edit.php
View File

@ -112,6 +112,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/placeholder/tmpl/edit.php
View File

@ -107,7 +107,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/server/tmpl/edit.php
View File

@ -120,7 +120,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

4
admin/views/site_views/view.html.php
View File

@ -193,14 +193,14 @@ class ComponentbuilderViewSite_views extends JViewLegacy
// Set Main Get Name Selection
$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
// We do some sanitation for filter
// We do some sanitation for Main Get Name filter
if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) &&
isset($this->main_getNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
{
unset($this->main_getNameOptions[0]);
}
// Only load filter if it has values
// Only load Main Get Name filter if it has values
if (ComponentbuilderHelper::checkArray($this->main_getNameOptions))
{
// Main Get Name Filter

1
admin/views/snippet/tmpl/edit.php
View File

@ -97,7 +97,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

1
admin/views/snippet_type/tmpl/edit.php
View File

@ -102,6 +102,5 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>

8
admin/views/snippets/view.html.php
View File

@ -198,14 +198,14 @@ class ComponentbuilderViewSnippets extends JViewLegacy
// Set Type Name Selection
$this->typeNameOptions = JFormHelper::loadFieldType('Snippettype')->options;
// We do some sanitation for filter
// We do some sanitation for Type Name filter
if (ComponentbuilderHelper::checkArray($this->typeNameOptions) &&
isset($this->typeNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->typeNameOptions[0]->value))
{
unset($this->typeNameOptions[0]);
}
// Only load filter if it has values
// Only load Type Name filter if it has values
if (ComponentbuilderHelper::checkArray($this->typeNameOptions))
{
// Type Name Filter
@ -228,14 +228,14 @@ class ComponentbuilderViewSnippets extends JViewLegacy
// Set Library Name Selection
$this->libraryNameOptions = JFormHelper::loadFieldType('Library')->options;
// We do some sanitation for filter
// We do some sanitation for Library Name filter
if (ComponentbuilderHelper::checkArray($this->libraryNameOptions) &&
isset($this->libraryNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->libraryNameOptions[0]->value))
{
unset($this->libraryNameOptions[0]);
}
// Only load filter if it has values
// Only load Library Name filter if it has values
if (ComponentbuilderHelper::checkArray($this->libraryNameOptions))
{
// Library Name Filter

4
admin/views/templates/view.html.php
View File

@ -193,14 +193,14 @@ class ComponentbuilderViewTemplates extends JViewLegacy
// Set Dynamic Get Name Selection
$this->dynamic_getNameOptions = JFormHelper::loadFieldType('Dynamicget')->options;
// We do some sanitation for filter
// We do some sanitation for Dynamic Get Name filter
if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions) &&
isset($this->dynamic_getNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
{
unset($this->dynamic_getNameOptions[0]);
}
// Only load filter if it has values
// Only load Dynamic Get Name filter if it has values
if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions))
{
// Dynamic Get Name Filter

1
admin/views/validation_rule/tmpl/edit.php
View File

@ -108,7 +108,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
<?php echo JHtml::_('form.token'); ?>
</div>
</div>
</div>
</form>
</div>