Powerful and easy to use cms to build websites, blogs or ecommerce stores.
HTML backendblogblog-engineblog-platformbloggingcmscontent-managementcontent-management-systemecommerceecommerce-platformno-codepage-builderphpphp-cmsphp7php8self-hostedshopping-cartweb-applicationwebsite-builder
Added categories for admin search
givanz7a4ad759087b
diff --git a/admin/controller/tools/search.php b/admin/controller/tools/search.phpindex f118ac8..0ef5535 100644--- a/admin/controller/tools/search.php+++ b/admin/controller/tools/search.php@@ -24,7 +24,9 @@ namespace Vvveb\Controller\Tools;use function Vvveb\__;use Vvveb\Controller\Base;+use function Vvveb\htmlToText;use Vvveb\System\Images;+use function Vvveb\truncateWords;use function Vvveb\url;@@ -86,6 +88,7 @@ class Search extends Base {'type' => 'cardimage','src' => $product['image'],'text' => $product['name'],+ 'description' => htmlToText(truncateWords($product['excerpt'] ?? $product['content'], 50)),'url' => $url,];}@@ -105,6 +108,7 @@ class Search extends Base {'type' => 'cardimage','src' => $post['image'],'text' => $post['name'],+ 'description' => htmlToText(truncateWords($post['excerpt'] ?? $post['content'], 50)),'url' => $url,];}@@ -132,6 +136,27 @@ class Search extends Base {}}+ $categories = new \Vvveb\Sql\CategorySQL();+ $results = $categories->getCategories($options + ['search' => $text]);++ if (isset($results['categories'])) {+ $key = __('taxonomy');+ foreach ($results['categories'] as $category) {+ $url = url(['module' => 'content/categories', 'taxonomy_id' => $category['taxonomy_id']]);+ if (isset($category['avatar'])) {+ $category['image']= Images::image($category['avatar'], 'category');+ }++ $search[$key][] = [+ 'type' => 'cardimage',+ 'src' => $category['image'],+ 'text' => $category['name'],+ 'description' => htmlToText(truncateWords($category['content'], 50)),+ 'url' => $url,+ ];+ }+ }+$results = [];$this->searchMenu($text, $results, $this->view->menu);diff --git a/admin/sql/mysqli/category.sql b/admin/sql/mysqli/category.sqlold mode 100755new mode 100644index 92e6003..fb4f389--- a/admin/sql/mysqli/category.sql+++ b/admin/sql/mysqli/category.sql@@ -98,7 +98,7 @@@IF isset(:search) && :searchTHEN- AND tc.name LIKE :search+ AND tc.name LIKE CONCAT('%',:search,'%')END @IF@@ -248,7 +248,7 @@@IF isset(:search)THEN- AND tc.name LIKE :search+ AND tc.name LIKE CONCAT('%',:search,'%')END @IF@@ -304,7 +304,7 @@)BEGIN-- taxonomy_item- SELECT *+ SELECT *, .name as name, _.slug as slugFROM taxonomy_item as _ -- (underscore) _ means that data will be kept in main array@IF isset(:post_id) THEN@@ -335,6 +335,11 @@END @IF+ @IF isset(:type)+ THEN+ INNER JOIN taxonomy t ON (_.taxonomy_id = t.taxonomy_id AND t.type = :type)+ END @IF+WHERE1 = 1@@ -351,7 +356,8 @@AND _.post_type = :post_typeEND @IF-++@IF isset(:post_id)THEN,pt.post_id as checked@@ -599,7 +605,7 @@@IF isset(:search) && :searchTHEN- AND tc.name LIKE :search+ AND tc.name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/mysqli/manufacturer.sql b/admin/sql/mysqli/manufacturer.sqlold mode 100755new mode 100644index d0d96a9..73072d9--- a/admin/sql/mysqli/manufacturer.sql+++ b/admin/sql/mysqli/manufacturer.sql@@ -117,7 +117,7 @@@IF isset(:search)THEN- AND name LIKE :search+ AND name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/mysqli/menu.sql b/admin/sql/mysqli/menu.sqlindex 9a47967..3ed06b6 100644--- a/admin/sql/mysqli/menu.sql+++ b/admin/sql/mysqli/menu.sql@@ -224,7 +224,7 @@)BEGIN- SELECT menu_item.url, menu_item.sort_order, menu_item.parent_id, menu_item.type, menu_item.item_id, td.*, menu_item.menu_item_id as menu_item_id, menu_item.menu_item_id as array_key+ SELECT menu_item.url, menu_item.sort_order, menu_item.parent_id, menu_item.type, menu_item.options, menu_item.item_id, td.*, menu_item.menu_item_id as menu_item_id, menu_item.menu_item_id as array_keyFROM menu_item@@ -315,7 +315,7 @@@IF isset(:search)THEN- AND td.name LIKE :search+ AND td.name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/mysqli/menu_item.sql b/admin/sql/mysqli/menu_item.sqlindex d11fad3..c4238b4 100644--- a/admin/sql/mysqli/menu_item.sql+++ b/admin/sql/mysqli/menu_item.sql@@ -106,7 +106,7 @@@IF isset(:search)THEN- AND td.name LIKE :search+ AND td.name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/mysqli/vendor.sql b/admin/sql/mysqli/vendor.sqlold mode 100755new mode 100644index a6c21a0..5979ad3--- a/admin/sql/mysqli/vendor.sql+++ b/admin/sql/mysqli/vendor.sql@@ -114,7 +114,7 @@@IF isset(:search)THEN- AND name LIKE :search+ AND name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/pgsql/category.sql b/admin/sql/pgsql/category.sqlold mode 100755new mode 100644index dcae55b..90a8481--- a/admin/sql/pgsql/category.sql+++ b/admin/sql/pgsql/category.sql@@ -97,7 +97,7 @@@IF isset(:search) && :searchTHEN- AND tc.name LIKE :search+ AND tc.name LIKE CONCAT('%',:search,'%')END @IF@@ -246,7 +246,7 @@@IF isset(:search)THEN- AND tc.name LIKE :search+ AND tc.name LIKE CONCAT('%',:search,'%')END @IF@@ -302,7 +302,7 @@)BEGIN-- taxonomy_item- SELECT *+ SELECT *, .name as name, _.slug as slugFROM taxonomy_item as _ -- (underscore) _ means that data will be kept in main array@IF isset(:post_id) THEN@@ -333,6 +333,11 @@END @IF+ @IF isset(:type)+ THEN+ INNER JOIN taxonomy t ON (_.taxonomy_id = t.taxonomy_id AND t.type = :type)+ END @IF+WHERE1 = 1@@ -589,7 +594,7 @@@IF isset(:search) && :searchTHEN- AND tc.name LIKE :search+ AND tc.name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/pgsql/manufacturer.sql b/admin/sql/pgsql/manufacturer.sqlold mode 100755new mode 100644index 1b95d58..276db2c--- a/admin/sql/pgsql/manufacturer.sql+++ b/admin/sql/pgsql/manufacturer.sql@@ -118,7 +118,7 @@@IF isset(:search)THEN- AND name LIKE :search+ AND name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/pgsql/menu.sql b/admin/sql/pgsql/menu.sqlindex 8e2d53a..eacbab8 100644--- a/admin/sql/pgsql/menu.sql+++ b/admin/sql/pgsql/menu.sql@@ -224,7 +224,7 @@)BEGIN- SELECT menu_item.url, menu_item.sort_order, menu_item.parent_id, menu_item.type, menu_item.item_id, td.*, menu_item.menu_item_id as menu_item_id, menu_item.menu_item_id as array_key+ SELECT menu_item.url, menu_item.sort_order, menu_item.parent_id, menu_item.type, menu_item.options, menu_item.item_id, td.*, menu_item.menu_item_id as menu_item_id, menu_item.menu_item_id as array_keyFROM menu_item@@ -306,7 +306,7 @@@IF isset(:search)THEN- AND td.name LIKE :search+ AND td.name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/pgsql/menu_item.sql b/admin/sql/pgsql/menu_item.sqlindex d11fad3..c4238b4 100644--- a/admin/sql/pgsql/menu_item.sql+++ b/admin/sql/pgsql/menu_item.sql@@ -106,7 +106,7 @@@IF isset(:search)THEN- AND td.name LIKE :search+ AND td.name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/pgsql/vendor.sql b/admin/sql/pgsql/vendor.sqlold mode 100755new mode 100644index 76a63a7..3bcdc72--- a/admin/sql/pgsql/vendor.sql+++ b/admin/sql/pgsql/vendor.sql@@ -115,7 +115,7 @@@IF isset(:search)THEN- AND name LIKE :search+ AND name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/sqlite/category.sql b/admin/sql/sqlite/category.sqlold mode 100755new mode 100644index f9521e4..9d00b10--- a/admin/sql/sqlite/category.sql+++ b/admin/sql/sqlite/category.sql@@ -97,7 +97,7 @@@IF isset(:search) && :searchTHEN- AND tc.name LIKE :search+ AND tc.name LIKE CONCAT('%',:search,'%')END @IF@@ -246,7 +246,7 @@@IF isset(:search)THEN- AND tc.name LIKE :search+ AND tc.name LIKE CONCAT('%',:search,'%')END @IF@@ -302,7 +302,7 @@)BEGIN-- taxonomy_item- SELECT *+ SELECT *, .name as name, _.slug as slugFROM taxonomy_item as _ -- (underscore) _ means that data will be kept in main array@IF isset(:post_id) THEN@@ -333,6 +333,11 @@END @IF+ @IF isset(:type)+ THEN+ INNER JOIN taxonomy t ON (_.taxonomy_id = t.taxonomy_id AND t.type = :type)+ END @IF+WHERE1 = 1@@ -598,7 +603,7 @@@IF isset(:search) && :searchTHEN- AND tc.name LIKE :search+ AND tc.name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/sqlite/manufacturer.sql b/admin/sql/sqlite/manufacturer.sqlold mode 100755new mode 100644index d0d96a9..73072d9--- a/admin/sql/sqlite/manufacturer.sql+++ b/admin/sql/sqlite/manufacturer.sql@@ -117,7 +117,7 @@@IF isset(:search)THEN- AND name LIKE :search+ AND name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/sqlite/menu.sql b/admin/sql/sqlite/menu.sqlindex 25c79a8..aafafc5 100644--- a/admin/sql/sqlite/menu.sql+++ b/admin/sql/sqlite/menu.sql@@ -224,7 +224,7 @@)BEGIN- SELECT menu_item.url, menu_item.sort_order, menu_item.parent_id, menu_item.type, menu_item.item_id, td.*, menu_item.menu_item_id as menu_item_id, menu_item.menu_item_id as array_key+ SELECT menu_item.url, menu_item.sort_order, menu_item.parent_id, menu_item.type, menu_item.options, menu_item.item_id, td.*, menu_item.menu_item_id as menu_item_id, menu_item.menu_item_id as array_keyFROM menu_item@@ -310,7 +310,7 @@@IF isset(:search)THEN- AND td.name LIKE :search+ AND td.name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/sqlite/menu_item.sql b/admin/sql/sqlite/menu_item.sqlindex d11fad3..c4238b4 100644--- a/admin/sql/sqlite/menu_item.sql+++ b/admin/sql/sqlite/menu_item.sql@@ -106,7 +106,7 @@@IF isset(:search)THEN- AND td.name LIKE :search+ AND td.name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/sql/sqlite/vendor.sql b/admin/sql/sqlite/vendor.sqlold mode 100755new mode 100644index a6c21a0..5979ad3--- a/admin/sql/sqlite/vendor.sql+++ b/admin/sql/sqlite/vendor.sql@@ -114,7 +114,7 @@@IF isset(:search)THEN- AND name LIKE :search+ AND name LIKE CONCAT('%',:search,'%')END @IFdiff --git a/admin/template/tools/search.tpl b/admin/template/tools/search.tplold mode 100755new mode 100644index 77d8936..6f22aac--- a/admin/template/tools/search.tpl+++ b/admin/template/tools/search.tpl@@ -1,7 +1,7 @@import(common.tpl)@group = .search-results .group-@item = .search-results .group .list-group-item+@item = .search-results .group li@group|deleteAllButFirstChild@item|deleteAllButFirstChild