Merge pull request #39 from ggoffy/master

- fixed problem with display filter
XoopsModules25x · Feb 21, 2021 · 9b6bed9 · 9b6bed9
2 parents 21b96ba + 64a5c53
commit 9b6bed9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/class/PackagesHandler.php b/class/PackagesHandler.php
@@ -177,7 +177,7 @@ public function getFormAllPackages($action = false)
      * @public function getForm
      * @param bool|string $action
      * @param string      $pkgFilterText
-     * @return \XoopsThemeForm
+     * @return \XoopsSimpleForm
      */
     public function getFormFilterPackages($action = false, $pkgFilterText = '')
     {

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -8,6 +8,7 @@
  - fixed data type bug (array/string) (goffy)
  - fixed problem with display collections (goffy)
  - added search to index page (goffy)
+ - fixed problem with display filter (goffy)
 
 ===================================================================
 2020/12/13 Version 1.05 alpha

diff --git a/index.php b/index.php
@@ -72,8 +72,8 @@
         $crPackages = new \CriteriaCompo();
         if ('' !== $pkgFilterText) {
             $crPkgFilter = new \CriteriaCompo();
-            $crPkgFilter->add(new \Criteria('pkg_name', '*' . $pkgFilterText . '*', 'LIKE'));
-            $crPkgFilter->add(new \Criteria('pkg_desc', '*' . $pkgFilterText . '*', 'LIKE'), 'OR');
+            $crPkgFilter->add(new \Criteria('pkg_name', '%' . $pkgFilterText . '%', 'LIKE'));
+            $crPkgFilter->add(new \Criteria('pkg_desc', '%' . $pkgFilterText . '%', 'LIKE'), 'OR');
             $crPackages->add($crPkgFilter);
         }
         $packagesCount = $packagesHandler->getCount($crPackages);

diff --git a/templates/wgtransifex_index.tpl b/templates/wgtransifex_index.tpl
@@ -40,18 +40,16 @@
 </table>
 <!-- End index list -->
 
-<{if $pagenav|default:'' != ''}>
-	<div class="row wgt-filter-row">
-		<div class="col-sm-12">
-			<a id="toggleFormFilter" class='btn btn-default pull-right' href='#' title='<{$btnFormFilterLabel}>'><{$btnFormFilterLabel}></a>
-		</div>
-		<{if $formFilter|default:''}>
-		<div id="formFilter" class="wgt-formFilter" style="display:<{$displayFormFilter}>">
-			<div class="col-sm-12"><{$formFilter}></div>
-		</div>
-		<{/if}>
+<div class="row wgt-filter-row">
+	<div class="col-sm-12">
+		<a id="toggleFormFilter" class='btn btn-default pull-right' href='#' title='<{$btnFormFilterLabel}>'><{$btnFormFilterLabel}></a>
 	</div>
-<{/if}>
+	<{if $formFilter|default:''}>
+	<div id="formFilter" class="wgt-formFilter" style="display:<{$displayFormFilter}>">
+		<div class="col-sm-12"><{$formFilter}></div>
+	</div>
+	<{/if}>
+</div>
 
 <div class='wgtransifex-linetitle'>
 	<{if $pkgFilterText|default:''}>