diff --git a/com_swjprojects/admin/language/en-GB/com_swjprojects.ini b/com_swjprojects/admin/language/en-GB/com_swjprojects.ini index bff1d31f..6fb3e960 100644 --- a/com_swjprojects/admin/language/en-GB/com_swjprojects.ini +++ b/com_swjprojects/admin/language/en-GB/com_swjprojects.ini @@ -1,5 +1,5 @@ ; @package SW JProjects -; @version 2.0.0 +; @version 2.0.1 ; @author Sergey Tolkachyov ; @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. ; @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/language/en-GB/com_swjprojects.sys.ini b/com_swjprojects/admin/language/en-GB/com_swjprojects.sys.ini index 73b227cc..40e52bdc 100644 --- a/com_swjprojects/admin/language/en-GB/com_swjprojects.sys.ini +++ b/com_swjprojects/admin/language/en-GB/com_swjprojects.sys.ini @@ -1,5 +1,5 @@ ; @package SW JProjects -; @version 2.0.0 +; @version 2.0.1 ; @author Sergey Tolkachyov ; @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. ; @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/language/ru-RU/com_swjprojects.ini b/com_swjprojects/admin/language/ru-RU/com_swjprojects.ini index 32d9dd87..9ef7b7b3 100644 --- a/com_swjprojects/admin/language/ru-RU/com_swjprojects.ini +++ b/com_swjprojects/admin/language/ru-RU/com_swjprojects.ini @@ -1,5 +1,5 @@ ; @package SW JProjects -; @version 2.0.0 +; @version 2.0.1 ; @author Sergey Tolkachyov ; @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. ; @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/language/ru-RU/com_swjprojects.sys.ini b/com_swjprojects/admin/language/ru-RU/com_swjprojects.sys.ini index f18bd2e2..69d11af3 100644 --- a/com_swjprojects/admin/language/ru-RU/com_swjprojects.sys.ini +++ b/com_swjprojects/admin/language/ru-RU/com_swjprojects.sys.ini @@ -1,5 +1,5 @@ ; @package SW JProjects -; @version 2.0.0 +; @version 2.0.1 ; @author Sergey Tolkachyov ; @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. ; @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/install.mysql.utf8.sql b/com_swjprojects/admin/sql/install.mysql.utf8.sql index 28173a3c..9f46f323 100644 --- a/com_swjprojects/admin/sql/install.mysql.utf8.sql +++ b/com_swjprojects/admin/sql/install.mysql.utf8.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/uninstall.mysql.utf8.sql b/com_swjprojects/admin/sql/uninstall.mysql.utf8.sql index a2f0286a..2dd368e3 100644 --- a/com_swjprojects/admin/sql/uninstall.mysql.utf8.sql +++ b/com_swjprojects/admin/sql/uninstall.mysql.utf8.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/updates/mysql/1.1.0.sql b/com_swjprojects/admin/sql/updates/mysql/1.1.0.sql index 0a14358d..9fc2b2b6 100644 --- a/com_swjprojects/admin/sql/updates/mysql/1.1.0.sql +++ b/com_swjprojects/admin/sql/updates/mysql/1.1.0.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/updates/mysql/1.3.0.sql b/com_swjprojects/admin/sql/updates/mysql/1.3.0.sql index 13609768..efb13cee 100644 --- a/com_swjprojects/admin/sql/updates/mysql/1.3.0.sql +++ b/com_swjprojects/admin/sql/updates/mysql/1.3.0.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/updates/mysql/1.5.0.sql b/com_swjprojects/admin/sql/updates/mysql/1.5.0.sql index e9d7ff69..4bbb51ab 100644 --- a/com_swjprojects/admin/sql/updates/mysql/1.5.0.sql +++ b/com_swjprojects/admin/sql/updates/mysql/1.5.0.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/updates/mysql/1.5.1.sql b/com_swjprojects/admin/sql/updates/mysql/1.5.1.sql index 74d130b5..5157e0c1 100644 --- a/com_swjprojects/admin/sql/updates/mysql/1.5.1.sql +++ b/com_swjprojects/admin/sql/updates/mysql/1.5.1.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/updates/mysql/1.5.5.sql b/com_swjprojects/admin/sql/updates/mysql/1.5.5.sql index 5c515a1a..a7f6d715 100644 --- a/com_swjprojects/admin/sql/updates/mysql/1.5.5.sql +++ b/com_swjprojects/admin/sql/updates/mysql/1.5.5.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/updates/mysql/1.5.7.sql b/com_swjprojects/admin/sql/updates/mysql/1.5.7.sql index 0ab3c5ea..a8327a24 100644 --- a/com_swjprojects/admin/sql/updates/mysql/1.5.7.sql +++ b/com_swjprojects/admin/sql/updates/mysql/1.5.7.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/updates/mysql/1.6.0.sql b/com_swjprojects/admin/sql/updates/mysql/1.6.0.sql index 6835de30..0f26fffe 100644 --- a/com_swjprojects/admin/sql/updates/mysql/1.6.0.sql +++ b/com_swjprojects/admin/sql/updates/mysql/1.6.0.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/updates/mysql/1.8.0.sql b/com_swjprojects/admin/sql/updates/mysql/1.8.0.sql index d56c47fa..6e5193ac 100644 --- a/com_swjprojects/admin/sql/updates/mysql/1.8.0.sql +++ b/com_swjprojects/admin/sql/updates/mysql/1.8.0.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/sql/updates/mysql/1.9.0.sql b/com_swjprojects/admin/sql/updates/mysql/1.9.0.sql index d2dcd83b..d7329c0c 100644 --- a/com_swjprojects/admin/sql/updates/mysql/1.9.0.sql +++ b/com_swjprojects/admin/sql/updates/mysql/1.9.0.sql @@ -1,6 +1,6 @@ /* * @package SW JProjects - * @version 2.0.0 + * @version 2.0.1 * @author Sergey Tolkachyov * @сopyright Copyright (c) 2018 - 2024 Sergey Tolkachyov. All rights reserved. * @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html diff --git a/com_swjprojects/admin/src/Controller/CategoriesController.php b/com_swjprojects/admin/src/Controller/CategoriesController.php index e43bc7e0..465f05a1 100644 --- a/com_swjprojects/admin/src/Controller/CategoriesController.php +++ b/com_swjprojects/admin/src/Controller/CategoriesController.php @@ -1,7 +1,7 @@ leftJoin($db->quoteName('#__swjprojects_translate_categories', 't_c') . ' ON t_c.id = c.id AND ' . $db->quoteName('t_c.language') . ' = ' . $db->quote($translate)); - // Join over versions for download counter - $query->select(array('SUM(vd.downloads) as downloads')) - ->leftJoin($db->quoteName('#__swjprojects_versions', 'vd') . ' ON vd.project_id = p.id' - . ' AND vd.state = 1'); + // Count over versions for download counter + $subQuerySumDownloads = $db->getQuery(true); + $subQuerySumDownloads + ->select('SUM(' . $db->quoteName('vd.downloads') . ')') + ->from($db->quoteName('#__swjprojects_versions', 'vd')) + ->where($db->quoteName('vd.project_id') . ' = ' . $db->quoteName('p.id')) + ->where($db->quoteName('vd.state') . ' = ' . $db->quote('1')); + $query->select('(' . (string) $subQuerySumDownloads . ') AS ' . $db->quoteName('downloads')); // Filter by published state $published = $this->getState('filter.published'); diff --git a/com_swjprojects/admin/src/Model/VersionModel.php b/com_swjprojects/admin/src/Model/VersionModel.php index 156a8ac9..b7e6d764 100644 --- a/com_swjprojects/admin/src/Model/VersionModel.php +++ b/com_swjprojects/admin/src/Model/VersionModel.php @@ -1,7 +1,7 @@