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

Refactored the setFilterFields and setStoredId in the compiler as still part of the new filter option improvement. gh-378

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2020-11-21 08:01:26 +02:00
parent 2490123095
commit 5db5ac7bbb
23 changed files with 291 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
admin/models/admin_views.php
View File

@ -29,14 +29,14 @@ class ComponentbuilderModelAdmin_views extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.system_name','system_name',
'a.name_single','name_single',
'a.short_description','short_description',
'a.add_fadein','add_fadein',
'a.type','type',
'a.add_custom_button','add_custom_button',
'a.add_php_ajax','add_php_ajax',
'a.add_custom_import','add_custom_import'
'a.add_custom_import','add_custom_import',
'a.system_name','system_name',
'a.name_single','name_single',
'a.short_description','short_description'
);
}
@ -621,14 +621,14 @@ class ComponentbuilderModelAdmin_views extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.system_name');
$id .= ':' . $this->getState('filter.name_single');
$id .= ':' . $this->getState('filter.short_description');
$id .= ':' . $this->getState('filter.add_fadein');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.add_custom_button');
$id .= ':' . $this->getState('filter.add_php_ajax');
$id .= ':' . $this->getState('filter.add_custom_import');
$id .= ':' . $this->getState('filter.add_custom_import');
$id .= ':' . $this->getState('filter.system_name');
$id .= ':' . $this->getState('filter.name_single');
$id .= ':' . $this->getState('filter.short_description');
return parent::getStoreId($id);
}

8
admin/models/class_extendings.php
View File

@ -29,8 +29,8 @@ class ComponentbuilderModelClass_extendings extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.name','name',
'a.extension_type','extension_type'
'a.extension_type','extension_type',
'a.name','name'
);
}
@ -251,8 +251,8 @@ class ComponentbuilderModelClass_extendings extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.extension_type');
$id .= ':' . $this->getState('filter.extension_type');
$id .= ':' . $this->getState('filter.name');
return parent::getStoreId($id);
}

8
admin/models/class_methods.php
View File

@ -29,9 +29,9 @@ class ComponentbuilderModelClass_methods extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.name','name',
'a.visibility','visibility',
'a.extension_type','extension_type'
'a.extension_type','extension_type',
'a.name','name'
);
}
@ -408,9 +408,9 @@ class ComponentbuilderModelClass_methods extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.visibility');
$id .= ':' . $this->getState('filter.extension_type');
$id .= ':' . $this->getState('filter.extension_type');
$id .= ':' . $this->getState('filter.name');
return parent::getStoreId($id);
}

8
admin/models/class_properties.php
View File

@ -29,9 +29,9 @@ class ComponentbuilderModelClass_properties extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.name','name',
'a.visibility','visibility',
'a.extension_type','extension_type'
'a.extension_type','extension_type',
'a.name','name'
);
}
@ -406,9 +406,9 @@ class ComponentbuilderModelClass_properties extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.visibility');
$id .= ':' . $this->getState('filter.extension_type');
$id .= ':' . $this->getState('filter.extension_type');
$id .= ':' . $this->getState('filter.name');
return parent::getStoreId($id);
}

16
admin/models/custom_admin_views.php
View File

@ -29,12 +29,12 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'g.name','main_get',
'a.add_php_ajax','add_php_ajax',
'a.add_custom_button','add_custom_button',
'a.system_name','system_name',
'a.name','name',
'a.description','description',
'g.name',
'a.add_php_ajax','add_php_ajax',
'a.add_custom_button','add_custom_button'
'a.description','description'
);
}
@ -440,12 +440,12 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.system_name');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.description');
$id .= ':' . $this->getState('filter.main_get');
$id .= ':' . $this->getState('filter.add_php_ajax');
$id .= ':' . $this->getState('filter.add_custom_button');
$id .= ':' . $this->getState('filter.add_custom_button');
$id .= ':' . $this->getState('filter.system_name');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.description');
return parent::getStoreId($id);
}

10
admin/models/custom_codes.php
View File

@ -29,11 +29,11 @@ class ComponentbuilderModelCustom_codes extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'g.system_name',
'a.path','path',
'g.system_name','component',
'a.target','target',
'a.type','type',
'a.comment_type','comment_type'
'a.comment_type','comment_type',
'a.path','path'
);
}
@ -469,10 +469,10 @@ class ComponentbuilderModelCustom_codes extends JModelList
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.component');
$id .= ':' . $this->getState('filter.path');
$id .= ':' . $this->getState('filter.target');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.comment_type');
$id .= ':' . $this->getState('filter.comment_type');
$id .= ':' . $this->getState('filter.path');
return parent::getStoreId($id);
}

8
admin/models/dynamic_gets.php
View File

@ -29,9 +29,9 @@ class ComponentbuilderModelDynamic_gets extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.name','name',
'a.main_source','main_source',
'a.gettype','gettype'
'a.gettype','gettype',
'a.name','name'
);
}
@ -415,9 +415,9 @@ class ComponentbuilderModelDynamic_gets extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.main_source');
$id .= ':' . $this->getState('filter.gettype');
$id .= ':' . $this->getState('filter.gettype');
$id .= ':' . $this->getState('filter.name');
return parent::getStoreId($id);
}

10
admin/models/fields.php
View File

@ -29,15 +29,15 @@ class ComponentbuilderModelFields extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.name','name',
'g.name',
'g.name','fieldtype',
'a.datatype','datatype',
'a.indexes','indexes',
'a.null_switch','null_switch',
'a.store','store',
'c.title','category_title',
'c.id', 'category_id',
'a.catid', 'catid'
'a.catid','catid',
'a.name','name'
);
}
@ -525,7 +525,6 @@ class ComponentbuilderModelFields extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.fieldtype');
$id .= ':' . $this->getState('filter.datatype');
$id .= ':' . $this->getState('filter.indexes');
@ -533,7 +532,8 @@ class ComponentbuilderModelFields extends JModelList
$id .= ':' . $this->getState('filter.store');
$id .= ':' . $this->getState('filter.category');
$id .= ':' . $this->getState('filter.category_id');
$id .= ':' . $this->getState('filter.catid');
$id .= ':' . $this->getState('filter.catid');
$id .= ':' . $this->getState('filter.name');
return parent::getStoreId($id);
}

12
admin/models/fieldtypes.php
View File

@ -29,11 +29,11 @@ class ComponentbuilderModelFieldtypes extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.name','name',
'a.short_description','short_description',
'c.title','category_title',
'c.id', 'category_id',
'a.catid', 'catid'
'a.catid','catid',
'a.name','name',
'a.short_description','short_description'
);
}
@ -362,11 +362,11 @@ class ComponentbuilderModelFieldtypes extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.short_description');
$id .= ':' . $this->getState('filter.category');
$id .= ':' . $this->getState('filter.category_id');
$id .= ':' . $this->getState('filter.catid');
$id .= ':' . $this->getState('filter.catid');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.short_description');
return parent::getStoreId($id);
}

10
admin/models/help_documents.php
View File

@ -29,11 +29,11 @@ class ComponentbuilderModelHelp_documents extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.title','title',
'a.type','type',
'a.location','location',
'g.',
'h.'
'a.admin_view','admin_view',
'a.site_view','site_view',
'a.title','title'
);
}
@ -405,11 +405,11 @@ class ComponentbuilderModelHelp_documents extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.title');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.location');
$id .= ':' . $this->getState('filter.admin_view');
$id .= ':' . $this->getState('filter.site_view');
$id .= ':' . $this->getState('filter.site_view');
$id .= ':' . $this->getState('filter.title');
return parent::getStoreId($id);
}

12
admin/models/joomla_components.php
View File

@ -29,11 +29,11 @@ class ComponentbuilderModelJoomla_components extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.companyname','companyname',
'a.author','author',
'a.system_name','system_name',
'a.name_code','name_code',
'a.short_description','short_description',
'a.companyname','companyname',
'a.author','author'
'a.short_description','short_description'
);
}
@ -2454,11 +2454,11 @@ class ComponentbuilderModelJoomla_components extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.companyname');
$id .= ':' . $this->getState('filter.author');
$id .= ':' . $this->getState('filter.system_name');
$id .= ':' . $this->getState('filter.name_code');
$id .= ':' . $this->getState('filter.short_description');
$id .= ':' . $this->getState('filter.companyname');
$id .= ':' . $this->getState('filter.author');
$id .= ':' . $this->getState('filter.short_description');
return parent::getStoreId($id);
}

8
admin/models/joomla_modules.php
View File

@ -29,9 +29,9 @@ class ComponentbuilderModelJoomla_modules extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.target','target',
'a.system_name','system_name',
'a.description','description',
'a.target','target'
'a.description','description'
);
}
@ -253,9 +253,9 @@ class ComponentbuilderModelJoomla_modules extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.target');
$id .= ':' . $this->getState('filter.system_name');
$id .= ':' . $this->getState('filter.description');
$id .= ':' . $this->getState('filter.target');
$id .= ':' . $this->getState('filter.description');
return parent::getStoreId($id);
}

8
admin/models/joomla_plugin_groups.php
View File

@ -29,8 +29,8 @@ class ComponentbuilderModelJoomla_plugin_groups extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.name','name',
'g.name'
'g.name','class_extends',
'a.name','name'
);
}
@ -198,8 +198,8 @@ class ComponentbuilderModelJoomla_plugin_groups extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.class_extends');
$id .= ':' . $this->getState('filter.class_extends');
$id .= ':' . $this->getState('filter.name');
return parent::getStoreId($id);
}

10
admin/models/joomla_plugins.php
View File

@ -29,9 +29,9 @@ class ComponentbuilderModelJoomla_plugins extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.system_name','system_name',
'g.name',
'h.name'
'g.name','class_extends',
'h.name','joomla_plugin_group',
'a.system_name','system_name'
);
}
@ -402,9 +402,9 @@ class ComponentbuilderModelJoomla_plugins extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.system_name');
$id .= ':' . $this->getState('filter.class_extends');
$id .= ':' . $this->getState('filter.joomla_plugin_group');
$id .= ':' . $this->getState('filter.joomla_plugin_group');
$id .= ':' . $this->getState('filter.system_name');
return parent::getStoreId($id);
}

12
admin/models/layouts.php
View File

@ -29,10 +29,10 @@ class ComponentbuilderModelLayouts extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'g.name','dynamic_get',
'a.add_php_view','add_php_view',
'a.name','name',
'a.description','description',
'g.name',
'a.add_php_view','add_php_view'
'a.description','description'
);
}
@ -392,10 +392,10 @@ class ComponentbuilderModelLayouts extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.description');
$id .= ':' . $this->getState('filter.dynamic_get');
$id .= ':' . $this->getState('filter.add_php_view');
$id .= ':' . $this->getState('filter.add_php_view');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.description');
return parent::getStoreId($id);
}

12
admin/models/libraries.php
View File

@ -29,11 +29,11 @@ class ComponentbuilderModelLibraries extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'a.name','name',
'a.target','target',
'a.how','how',
'a.type','type',
'a.description','description',
'a.how','how'
'a.name','name',
'a.description','description'
);
}
@ -308,11 +308,11 @@ class ComponentbuilderModelLibraries extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.target');
$id .= ':' . $this->getState('filter.how');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.description');
$id .= ':' . $this->getState('filter.how');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.description');
return parent::getStoreId($id);
}

16
admin/models/site_views.php
View File

@ -29,13 +29,13 @@ class ComponentbuilderModelSite_views extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'g.name','main_get',
'a.add_php_ajax','add_php_ajax',
'a.add_custom_button','add_custom_button',
'a.system_name','system_name',
'a.name','name',
'a.description','description',
'g.name',
'a.context','context',
'a.add_php_ajax','add_php_ajax',
'a.add_custom_button','add_custom_button'
'a.context','context'
);
}
@ -444,13 +444,13 @@ class ComponentbuilderModelSite_views extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.main_get');
$id .= ':' . $this->getState('filter.add_php_ajax');
$id .= ':' . $this->getState('filter.add_custom_button');
$id .= ':' . $this->getState('filter.system_name');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.description');
$id .= ':' . $this->getState('filter.main_get');
$id .= ':' . $this->getState('filter.context');
$id .= ':' . $this->getState('filter.add_php_ajax');
$id .= ':' . $this->getState('filter.add_custom_button');
$id .= ':' . $this->getState('filter.context');
return parent::getStoreId($id);
}

12
admin/models/snippets.php
View File

@ -29,11 +29,11 @@ class ComponentbuilderModelSnippets extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'g.name','type',
'h.name','library',
'a.name','name',
'a.url','url',
'g.name',
'a.heading','heading',
'h.name'
'a.heading','heading'
);
}
@ -478,11 +478,11 @@ class ComponentbuilderModelSnippets extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.library');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.url');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.heading');
$id .= ':' . $this->getState('filter.library');
$id .= ':' . $this->getState('filter.heading');
return parent::getStoreId($id);
}

12
admin/models/templates.php
View File

@ -29,10 +29,10 @@ class ComponentbuilderModelTemplates extends JModelList
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
'g.name','dynamic_get',
'a.add_php_view','add_php_view',
'a.name','name',
'a.description','description',
'g.name',
'a.add_php_view','add_php_view'
'a.description','description'
);
}
@ -392,10 +392,10 @@ class ComponentbuilderModelTemplates extends JModelList
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.description');
$id .= ':' . $this->getState('filter.dynamic_get');
$id .= ':' . $this->getState('filter.add_php_view');
$id .= ':' . $this->getState('filter.add_php_view');
$id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.description');
return parent::getStoreId($id);
}