From 87de251f2ec8e899e03aba7b5ad887154d6b6a91 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 3 Nov 2017 23:57:15 +0200 Subject: [PATCH] Resolved gh-165 pagination issue thanks @kevincam3 --- README.md | 2 +- admin/README.txt | 2 +- admin/assets/css/admin.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/js/admin.js | 2 +- admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/import_joomla_components.php | 2 +- admin/helpers/compiler/e_Interpretation.php | 2 +- admin/helpers/componentbuilder.php | 2 +- admin/helpers/componentbuilderemail.php | 2 +- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- admin/layouts/admin_fields/fields_above.php | 2 +- admin/layouts/admin_fields/fields_fullwidth.php | 2 +- admin/layouts/admin_fields/publishing.php | 2 +- admin/layouts/admin_fields/publlshing.php | 2 +- admin/layouts/admin_fields_conditions/conditions_above.php | 2 +- admin/layouts/admin_fields_conditions/conditions_fullwidth.php | 2 +- admin/layouts/admin_fields_conditions/publishing.php | 2 +- admin/layouts/admin_fields_conditions/publlshing.php | 2 +- admin/layouts/admin_view/css_fullwidth.php | 2 +- admin/layouts/admin_view/custom_buttons_fullwidth.php | 2 +- admin/layouts/admin_view/custom_buttons_left.php | 2 +- admin/layouts/admin_view/custom_import_fullwidth.php | 2 +- admin/layouts/admin_view/details_above.php | 2 +- admin/layouts/admin_view/details_left.php | 2 +- admin/layouts/admin_view/details_right.php | 2 +- admin/layouts/admin_view/details_under.php | 2 +- admin/layouts/admin_view/fields_conditions_fullwidth.php | 2 +- admin/layouts/admin_view/fields_conditions_left.php | 2 +- admin/layouts/admin_view/fields_conditions_right.php | 2 +- admin/layouts/admin_view/javascript_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 2 +- admin/layouts/admin_view/settings_fullwidth.php | 2 +- admin/layouts/batchselection.php | 2 +- admin/layouts/component_admin_views/publishing.php | 2 +- admin/layouts/component_admin_views/publlshing.php | 2 +- admin/layouts/component_admin_views/views_above.php | 2 +- admin/layouts/component_admin_views/views_fullwidth.php | 2 +- admin/layouts/component_config/publishing.php | 2 +- admin/layouts/component_config/publlshing.php | 2 +- admin/layouts/component_config/tweaks_above.php | 2 +- admin/layouts/component_config/tweaks_fullwidth.php | 2 +- admin/layouts/component_custom_admin_menus/publishing.php | 2 +- admin/layouts/component_custom_admin_menus/publlshing.php | 2 +- admin/layouts/component_custom_admin_menus/tweaks_above.php | 2 +- admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php | 2 +- admin/layouts/component_custom_admin_views/publishing.php | 2 +- admin/layouts/component_custom_admin_views/publlshing.php | 2 +- admin/layouts/component_custom_admin_views/views_above.php | 2 +- admin/layouts/component_custom_admin_views/views_fullwidth.php | 2 +- admin/layouts/component_dashboard/dashboard_above.php | 2 +- admin/layouts/component_dashboard/dashboard_fullwidth.php | 2 +- admin/layouts/component_dashboard/publishing.php | 2 +- admin/layouts/component_dashboard/publlshing.php | 2 +- admin/layouts/component_files_folders/publishing.php | 2 +- admin/layouts/component_files_folders/publlshing.php | 2 +- admin/layouts/component_files_folders/settings_above.php | 2 +- admin/layouts/component_files_folders/settings_fullwidth.php | 2 +- admin/layouts/component_mysql_tweaks/publishing.php | 2 +- admin/layouts/component_mysql_tweaks/publlshing.php | 2 +- admin/layouts/component_mysql_tweaks/tweaks_above.php | 2 +- admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php | 2 +- admin/layouts/component_site_views/publishing.php | 2 +- admin/layouts/component_site_views/publlshing.php | 2 +- admin/layouts/component_site_views/views_above.php | 2 +- admin/layouts/component_site_views/views_fullwidth.php | 2 +- admin/layouts/component_updates/publishing.php | 2 +- admin/layouts/component_updates/publlshing.php | 2 +- admin/layouts/component_updates/updates_above.php | 2 +- admin/layouts/component_updates/updates_fullwidth.php | 2 +- admin/layouts/custom_admin_view/custom_buttons_fullwidth.php | 2 +- admin/layouts/custom_admin_view/custom_buttons_left.php | 2 +- admin/layouts/custom_admin_view/custom_script_fullwidth.php | 2 +- admin/layouts/custom_admin_view/details_above.php | 2 +- admin/layouts/custom_admin_view/details_fullwidth.php | 2 +- admin/layouts/custom_admin_view/details_left.php | 2 +- admin/layouts/custom_admin_view/details_right.php | 2 +- admin/layouts/custom_admin_view/details_rightside.php | 2 +- admin/layouts/custom_admin_view/details_under.php | 2 +- admin/layouts/custom_admin_view/linked_components_fullwidth.php | 2 +- admin/layouts/custom_admin_view/publishing.php | 2 +- admin/layouts/custom_admin_view/publlshing.php | 2 +- admin/layouts/custom_code/details_above.php | 2 +- admin/layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/details_under.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 2 +- admin/layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- admin/layouts/dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/joint_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_above.php | 2 +- admin/layouts/dynamic_get/main_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_left.php | 2 +- admin/layouts/dynamic_get/main_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 2 +- admin/layouts/dynamic_get/tweak_fullwidth.php | 2 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 2 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_fullwidth.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 2 +- admin/layouts/ftp/details_above.php | 2 +- admin/layouts/ftp/details_fullwidth.php | 2 +- admin/layouts/ftp/linked_components_fullwidth.php | 2 +- admin/layouts/ftp/publishing.php | 2 +- admin/layouts/ftp/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- admin/layouts/help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- admin/layouts/joomla_component/admin_views_fullwidth.php | 2 +- admin/layouts/joomla_component/custom_admin_views_fullwidth.php | 2 +- admin/layouts/joomla_component/details_above.php | 2 +- admin/layouts/joomla_component/details_left.php | 2 +- admin/layouts/joomla_component/details_right.php | 2 +- admin/layouts/joomla_component/details_under.php | 2 +- admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php | 2 +- .../layouts/joomla_component/dynamic_integration_fullwidth.php | 2 +- admin/layouts/joomla_component/libs_helpers_fullwidth.php | 2 +- admin/layouts/joomla_component/metadata.php | 2 +- admin/layouts/joomla_component/mysql_fullwidth.php | 2 +- admin/layouts/joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/php_left.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- admin/layouts/joomla_component/readme_left.php | 2 +- admin/layouts/joomla_component/readme_right.php | 2 +- admin/layouts/joomla_component/settings_fullwidth.php | 2 +- admin/layouts/joomla_component/settings_left.php | 2 +- admin/layouts/joomla_component/settings_right.php | 2 +- admin/layouts/joomla_component/site_views_fullwidth.php | 2 +- admin/layouts/joomla_component/translation_fullwidth.php | 2 +- admin/layouts/language/details_left.php | 2 +- admin/layouts/language/details_right.php | 2 +- admin/layouts/language/publishing.php | 2 +- admin/layouts/language/publlshing.php | 2 +- admin/layouts/language_translation/details_fullwidth.php | 2 +- admin/layouts/language_translation/publishing.php | 2 +- admin/layouts/language_translation/publlshing.php | 2 +- admin/layouts/layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 2 +- admin/layouts/site_view/custom_buttons_fullwidth.php | 2 +- admin/layouts/site_view/custom_buttons_left.php | 2 +- admin/layouts/site_view/custom_buttons_right.php | 2 +- admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- admin/layouts/site_view/javascript_css_fullwidth.php | 2 +- admin/layouts/site_view/linked_components_fullwidth.php | 2 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 2 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 2 +- admin/layouts/template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 2 +- admin/models/ajax.php | 2 +- admin/models/componentbuilder.php | 2 +- admin/models/fields/adminsviews.php | 2 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/componentadminmenus.php | 2 +- admin/models/fields/componentadminviews.php | 2 +- admin/models/fields/components.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicget.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/joomlacomponents.php | 2 +- admin/models/fields/lang.php | 2 +- admin/models/fields/maingets.php | 2 +- admin/models/fields/matchfield.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/fields/targetfields.php | 2 +- admin/models/fields/viewtabs.php | 2 +- admin/models/import.php | 2 +- admin/models/import_joomla_components.php | 2 +- admin/views/componentbuilder/tmpl/default.php | 2 +- .../tmpl/default_issues_the_closed_issues_on_github.php | 2 +- .../tmpl/default_issues_the_open_issues_on_github.php | 2 +- admin/views/componentbuilder/tmpl/default_main.php | 2 +- .../views/componentbuilder/tmpl/default_readme_information.php | 2 +- .../componentbuilder/tmpl/default_releases_information.php | 2 +- .../tmpl/default_vast_development_method_notice_board.php | 2 +- admin/views/componentbuilder/tmpl/default_vdm.php | 2 +- admin/views/componentbuilder/tmpl/default_wiki_tutorials.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/import_joomla_components/tmpl/default.php | 2 +- admin/views/import_joomla_components/view.html.php | 2 +- componentbuilder.xml | 2 +- script.php | 2 +- site/assets/css/site.css | 2 +- site/assets/js/site.js | 2 +- site/componentbuilder.php | 2 +- site/controller.php | 2 +- site/controllers/api.php | 2 +- site/controllers/help.php | 2 +- site/helpers/category.php | 2 +- site/helpers/categoryfields.php | 2 +- site/helpers/categoryfieldtypes.php | 2 +- site/helpers/componentbuilder.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/router.php | 2 +- site/views/api/submitbutton.js | 2 +- 262 files changed, 262 insertions(+), 262 deletions(-) diff --git a/README.md b/README.md index 4d41919db..cc942ddcc 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 2nd November, 2017 ++ *Last Build*: 3rd November, 2017 + *Version*: 2.6.1 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/README.txt b/admin/README.txt index 4d41919db..cc942ddcc 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -111,7 +111,7 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 2nd November, 2017 ++ *Last Build*: 3rd November, 2017 + *Version*: 2.6.1 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index d2de6a768..439b9a3f2 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 5cd3b128c..a5452a5cb 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index a481c3780..1861ac3c2 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.js diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 8be8102f9..a6299d07a 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 75f32c8f0..7401d073a 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 29728f8ef..1cee5fc22 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 18472e6af..d10494007 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 72f6a2c19..139aed7a6 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 85765bf4f..965ac2984 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index f9292ce7e..40b7d4266 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.6.1 - @build 2nd November, 2017 + @build 3rd November, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 99ab1469d..a96a6a53a 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -3539,7 +3539,7 @@ class Interpretation extends Fields $this->placeholders['[[[LIMITBOX]]]'] = 'pagination->getLimitBox(); ?>'; } $body[] = $this->setPlaceholders($view['settings']->default, $this->placeholders); - $body[] = PHP_EOL.'items) && '.$this->fileContentStatic['###component###'].'Helper::checkArray($this->items) && count($this->items) > 4): ?>'; + $body[] = PHP_EOL.'items) && isset($this->pagination) && isset($this->pagination->pagesTotal) && $this->pagination->pagesTotal > 1): ?>'; $body[] = '
'; $body[] = "\t".'