Merge pull request #18 from ggoffy/master

- fixed bug with reading single project
XoopsModules25x · Jul 26, 2020 · 45fa122 · 45fa122
2 parents 75f177e + 30bea26
commit 45fa122
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/blocks/packages.php b/blocks/packages.php
@@ -20,9 +20,7 @@
  * @author         Goffy - Email:<webmaster@wedega.com> - Website:<https://wedega.com> / <https://xoops.org>
  */
 
-use XoopsModules\Wgtransifex;
 use XoopsModules\Wgtransifex\Helper;
-use XoopsModules\Wgtransifex\Constants;
 
 include_once XOOPS_ROOT_PATH . '/modules/wgtransifex/include/common.php';
 
@@ -33,8 +31,7 @@
  */
 function b_wgtransifex_packages_show($options)
 {
-	include_once XOOPS_ROOT_PATH . '/modules/wgtransifex/class/packages.php';
-	$myts = MyTextSanitizer::getInstance();
+	$myts = \MyTextSanitizer::getInstance();
 	$GLOBALS['xoopsTpl']->assign('wgtransifex_upload_url', WGTRANSIFEX_UPLOAD_URL);
     $GLOBALS['xoopsTpl']->assign('modPathIconFlags', WGTRANSIFEX_IMAGE_URL . '/flags/');
 	$block            = [];
@@ -105,7 +102,6 @@ function b_wgtransifex_packages_show($options)
  */
 function b_wgtransifex_packages_edit($options)
 {
-	include_once \XOOPS_ROOT_PATH . '/modules/wgtransifex/class/packages.php';
 	$helper = Helper::getInstance();
 	$packagesHandler = $helper->getHandler('Packages');
 	$GLOBALS['xoopsTpl']->assign('wgtransifex_upload_url', \WGTRANSIFEX_UPLOAD_URL);

diff --git a/class/Transifex.php b/class/Transifex.php
@@ -89,11 +89,11 @@ public function readProjects($proId, $user = false)
                 } else {
                     $projectsObj = $projectsHandler->get($projectsObjExist[0]->getVar('pro_id'));
                 }
-                $projectsObj->setVar('pro_status', Constants::STATUS_READTX);
+                $proStatus = Constants::STATUS_READTX;
                 $oldProject = true;
             } else {
                 $projectsObj = $projectsHandler->create();
-                $projectsObj->setVar('pro_status', Constants::STATUS_READTXNEW);
+                $proStatus = Constants::STATUS_READTXNEW;
             }
             if (\is_object($projectsObj)) {
                 $project = $transifexLib->getProject($item['slug'], true);
@@ -108,6 +108,7 @@ public function readProjects($proId, $user = false)
                         $projectsObj->setVar('pro_status', Constants::STATUS_ARCHIVED);
                         $projectsObj->setVar('pro_archived', 1);
                     } else {
+                        $projectsObj->setVar('pro_status', $proStatus);
                         $projectsObj->setVar('pro_archived', 0);
                     }
                     $projectsObj->setVar('pro_txresources', \count($project['resources']));

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -2,7 +2,8 @@
 Change Log for wgTransifex - 2020/07/26 12:35:41 Version 1.03 RC1
 ===================================================================
  - moved to RC1 (goffy)
-
+ - fixed bug with reading single project (Cesagonchu/goffy)
+
 ===================================================================
 Change Log for wgTransifex - 2020/06/14 12:35:41 Version 1.03
 ===================================================================