+
+
+
+
+
+
+
+
+
+
-
+
+
+
- No results found for '
-
+
+
No results found. Please try another search.
-
-
-
- ![]()
-
-
-
-
-
diff --git a/addons/website/static/src/snippets/s_searchbar/search_bar.js b/addons/website/static/src/snippets/s_searchbar/search_bar.js
index 98ac1f3891998..8310f8603e093 100644
--- a/addons/website/static/src/snippets/s_searchbar/search_bar.js
+++ b/addons/website/static/src/snippets/s_searchbar/search_bar.js
@@ -5,6 +5,7 @@ import { markup } from "@odoo/owl";
import { rpc } from "@web/core/network/rpc";
import { getTemplate } from "@web/core/templates";
import { KeepLast } from "@web/core/utils/concurrency";
+import { SIZES, MEDIAS_BREAKPOINTS } from "@web/core/ui/ui_service";
export class SearchBar extends Interaction {
static selector = ".o_searchbar_form";
@@ -22,6 +23,9 @@ export class SearchBar extends Interaction {
"t-on-keydown": this.onKeydown,
"t-on-search": this.onSearch,
},
+ ".o_search_result_item a": {
+ "t-on-keydown": this.onSearchResultKeydown,
+ },
};
autocompleteMinWidth = 300;
@@ -33,7 +37,7 @@ export class SearchBar extends Interaction {
const orderByEl = this.el.querySelector(".o_search_order_by");
const form = orderByEl.closest("form");
this.order = orderByEl.value;
- this.limit = parseInt(this.inputEl.dataset.limit) || 5;
+ this.limit = parseInt(this.inputEl.dataset.limit) || 6;
this.wasEmpty = !this.inputEl.value;
this.linkHasFocus = false;
if (this.limit) {
@@ -41,10 +45,7 @@ export class SearchBar extends Interaction {
}
const dataset = this.inputEl.dataset;
this.options = {
- displayImage: dataset.displayImage,
- displayDescription: dataset.displayDescription,
- displayExtraLink: dataset.displayExtraLink,
- displayDetail: dataset.displayDetail,
+ searchType: dataset.searchType,
// Make it easy for customization to disable fuzzy matching on specific searchboxes
allowFuzzy: !dataset.noFuzzy,
};
@@ -89,6 +90,13 @@ export class SearchBar extends Interaction {
this.render(null);
}
+ getDisplayType() {
+ if (this.el.clientWidth > MEDIAS_BREAKPOINTS[SIZES.SM].maxWidth) {
+ return "columns";
+ }
+ return "list";
+ }
+
async fetch() {
const res = await rpc("/website/snippet/autocomplete", {
search_type: this.searchType,
@@ -96,18 +104,25 @@ export class SearchBar extends Interaction {
order: this.order,
limit: this.limit,
max_nb_chars: Math.round(
- Math.max(this.autocompleteMinWidth, parseInt(this.el.clientWidth)) * 0.22
+ Math.max(
+ this.autocompleteMinWidth,
+ parseInt(this.el.clientWidth / (this.getDisplayType() === "columns" ? 3 : 1))
+ ) * 0.22
),
options: this.options,
});
- const fieldNames = this.getFieldsNames();
- res.results.forEach((record) => {
- for (const fieldName of fieldNames) {
- if (record[fieldName]) {
- record[fieldName] = markup(record[fieldName]);
+
+ const field_set = new Set(this.getFieldsNames());
+ for (const group in res.results) {
+ const data = res.results[group].data;
+ data.forEach((record) => {
+ for (const key in record) {
+ if (field_set.has(key) && record[key]) {
+ record[key] = markup(record[key]);
+ }
}
- }
- });
+ });
+ }
return res;
}
@@ -120,7 +135,7 @@ export class SearchBar extends Interaction {
}
const prevMenuEl = this.menuEl;
if (res && this.limit) {
- const results = res["results"];
+ const results = res.results;
let template = "website.s_searchbar.autocomplete";
const candidate = template + "." + this.searchType;
if (getTemplate(candidate)) {
@@ -131,10 +146,11 @@ export class SearchBar extends Interaction {
{
results: results,
parts: res["parts"],
- hasMoreResults: results.length < res["results_count"],
+ limit: this.limit,
search: this.inputEl.value,
fuzzySearch: res["fuzzy_search"],
widget: this.options,
+ displayType: this.getDisplayType(),
},
this.el
)[0];
@@ -185,16 +201,21 @@ export class SearchBar extends Interaction {
this.render();
break;
case "ArrowUp":
+ ev.preventDefault();
+ if (this.menuEl) {
+ const allResults = [...this.menuEl.querySelectorAll(".o_search_result_item a")];
+ if (allResults.length > 0) {
+ allResults[allResults.length - 1].focus();
+ }
+ }
+ break;
case "ArrowDown":
ev.preventDefault();
if (this.menuEl) {
- const focusableEls = [this.inputEl, ...this.menuEl.children];
- const focusedEl = document.activeElement;
- const currentIndex = focusableEls.indexOf(focusedEl) || 0;
- const delta = ev.key === "ArrowUp" ? focusableEls.length - 1 : 1;
- const nextIndex = (currentIndex + delta) % focusableEls.length;
- const nextFocusedEl = focusableEls[nextIndex];
- nextFocusedEl.focus();
+ const firstResult = this.menuEl.querySelector(".o_search_result_item a");
+ if (firstResult) {
+ firstResult.focus();
+ }
}
break;
case "Enter":
@@ -203,6 +224,133 @@ export class SearchBar extends Interaction {
}
}
+ /**
+ * Handle keyboard navigation within search results
+ * @param {KeyboardEvent} ev
+ */
+ onSearchResultKeydown(ev) {
+ const allResults = [...this.menuEl.querySelectorAll(".o_search_result_item a")];
+ const currentResult = ev.currentTarget;
+ const currentIndex = allResults.indexOf(currentResult);
+
+ switch (ev.key) {
+ case "Escape":
+ this.render();
+ break;
+ case "ArrowUp": {
+ ev.preventDefault();
+ // Check if current element is in the first row
+ const currentRect = currentResult.getBoundingClientRect();
+ const isFirstRow = allResults.every((el, idx) => {
+ if (idx === currentIndex) {
+ return true;
+ }
+ const rect = el.getBoundingClientRect();
+ return rect.top >= currentRect.top - 5; // Allow small tolerance
+ });
+
+ if (isFirstRow) {
+ // Focus back to input when in first row
+ this.inputEl.focus();
+ } else {
+ this.navigateByDirection(currentIndex, allResults, "up");
+ }
+ break;
+ }
+ case "ArrowDown":
+ ev.preventDefault();
+ this.navigateByDirection(currentIndex, allResults, "down");
+ break;
+ case "ArrowLeft":
+ ev.preventDefault();
+ this.navigateByDirection(currentIndex, allResults, "left");
+ break;
+ case "ArrowRight":
+ ev.preventDefault();
+ this.navigateByDirection(currentIndex, allResults, "right");
+ break;
+ }
+ }
+
+ /**
+ * Navigate through search results based on their visual position
+ * @param {number} currentIndex
+ * @param {Array} allResults
+ * @param {string} direction - "up", "down", "left", "right"
+ */
+ navigateByDirection(currentIndex, allResults, direction) {
+ const currentRect = allResults[currentIndex].getBoundingClientRect();
+ const currentCenterX = currentRect.left + currentRect.width / 2;
+ const currentCenterY = currentRect.top + currentRect.height / 2;
+
+ let nextIndex = -1;
+ let bestDistance = Infinity;
+
+ allResults.forEach((el, index) => {
+ if (index === currentIndex) {
+ return;
+ }
+
+ const rect = el.getBoundingClientRect();
+ const centerX = rect.left + rect.width / 2;
+ const centerY = rect.top + rect.height / 2;
+
+ let isInDirection = false;
+ let distance = 0;
+
+ switch (direction) {
+ case "down":
+ if (centerY > currentCenterY) {
+ isInDirection = true;
+ distance = Math.sqrt(
+ Math.pow(centerY - currentCenterY, 2) +
+ Math.pow(Math.abs(centerX - currentCenterX) / 2, 2)
+ );
+ }
+ break;
+ case "up":
+ if (centerY < currentCenterY) {
+ isInDirection = true;
+ distance = Math.sqrt(
+ Math.pow(currentCenterY - centerY, 2) +
+ Math.pow(Math.abs(centerX - currentCenterX) / 2, 2)
+ );
+ }
+ break;
+ case "right":
+ if (centerX > currentCenterX) {
+ isInDirection = true;
+ distance = Math.sqrt(
+ Math.pow(centerX - currentCenterX, 2) +
+ Math.pow(Math.abs(centerY - currentCenterY) / 2, 2)
+ );
+ }
+ break;
+ case "left":
+ if (centerX < currentCenterX) {
+ isInDirection = true;
+ distance = Math.sqrt(
+ Math.pow(currentCenterX - centerX, 2) +
+ Math.pow(Math.abs(centerY - currentCenterY) / 2, 2)
+ );
+ }
+ break;
+ }
+
+ if (isInDirection && distance < bestDistance) {
+ bestDistance = distance;
+ nextIndex = index;
+ }
+ });
+
+ // If no element found in direction and moving down, wrap to input
+ if (nextIndex >= 0) {
+ allResults[nextIndex].focus();
+ } else if (direction === "down") {
+ this.inputEl.focus();
+ }
+ }
+
/**
* @param {MouseEvent} ev
*/
diff --git a/addons/website/static/src/snippets/s_searchbar/search_bar_results.js b/addons/website/static/src/snippets/s_searchbar/search_bar_results.js
index c73f8455236c9..f8a7d3b99fe05 100644
--- a/addons/website/static/src/snippets/s_searchbar/search_bar_results.js
+++ b/addons/website/static/src/snippets/s_searchbar/search_bar_results.js
@@ -22,7 +22,7 @@ export class SearchBarResults extends Interaction {
"max-height": `max(40vh, ${
document.body.clientHeight - bcr.bottom - 16
}px) !important`,
- "min-width": this.autocompleteMinWidth,
+ "min-width": `${this.autocompleteMinWidth}px`,
};
},
"t-att-class": () => ({
diff --git a/addons/website/static/tests/builder/website_builder/searchbar_option.test.js b/addons/website/static/tests/builder/website_builder/searchbar_option.test.js
index 25bd73be834c7..5691402ab9afd 100644
--- a/addons/website/static/tests/builder/website_builder/searchbar_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/searchbar_option.test.js
@@ -57,17 +57,6 @@ test("Available 'order by' options are updated after switching search type", asy
expect(".o_popover[role=menu] [data-action-id='setOrderBy']").toHaveCount(2);
});
-test("Switching search type changes data checkboxes", async () => {
- await setupWebsiteBuilder(searchbarHTML("name asc"));
- await contains(":iframe .search-query").click();
- expect("[data-label='Search within'] button.o-dropdown").toHaveText("Pages");
- expect(".form-check-input").toHaveCount(1);
- await contains("[data-label='Search within'] button.o-dropdown").click();
- await contains(".o_popover[role=menu] [data-action-value='/website/search']").click();
- expect("[data-label='Search within'] button.o-dropdown").toHaveText("Everything");
- expect(".form-check-input").toHaveCount(4);
-});
-
test("Switching search type resets 'order by' option to default", async () => {
await setupWebsiteBuilder(searchbarHTML("write_date asc"));
await contains(":iframe .search-query").click();
diff --git a/addons/website/static/tests/interactions/snippets/search_bar.test.js b/addons/website/static/tests/interactions/snippets/search_bar.test.js
index 64486139e032e..09057d2a03ba0 100644
--- a/addons/website/static/tests/interactions/snippets/search_bar.test.js
+++ b/addons/website/static/tests/interactions/snippets/search_bar.test.js
@@ -30,35 +30,33 @@ const searchTemplate = /* html */ `
`;
-function supportAutocomplete() {
+function supportAutocomplete(numberOfResults = 3) {
onRpc("/website/snippet/autocomplete", async (args) => {
const json = JSON.parse(new TextDecoder().decode(await args.arrayBuffer()));
expect(json.params.search_type).toBe("test");
expect(json.params.term).toBe("xyz");
expect(json.params.order).toBe("test desc");
expect(json.params.limit).toBe(3);
- expect(json.params.options.displayImage).toBe("false");
- expect(json.params.options.displayDescription).toBe("false");
- expect(json.params.options.displayExtraLink).toBe("true");
- expect(json.params.options.displayDetail).toBe("false");
+
+ const allData = [
+ { _fa: "fa-file-o", name: "Xyz 1", website_url: "/website/test/xyz-1" },
+ { _fa: "fa-file-o", name: "Xyz 2", website_url: "/website/test/xyz-2" },
+ { _fa: "fa-file-o", name: "Xyz 3", website_url: "/website/test/xyz-3" },
+ { _fa: "fa-file-o", name: "Xyz 4", website_url: "/website/test/xyz-1" },
+ { _fa: "fa-file-o", name: "Xyz 5", website_url: "/website/test/xyz-2" },
+ { _fa: "fa-file-o", name: "Xyz 6", website_url: "/website/test/xyz-3" },
+ ];
+
return {
- results: [
- {
- _fa: "fa-file-o",
- name: "Xyz 1",
- website_url: "/website/test/xyz-1",
- },
- {
- _fa: "fa-file-o",
- name: "Xyz 2",
- website_url: "/website/test/xyz-2",
- },
- {
- _fa: "fa-file-o",
- name: "Xyz 3",
- website_url: "/website/test/xyz-3",
+ results: {
+ pages: {
+ groupName: "Pages",
+ templateKey: "website.search_items_page",
+ search_count: 3,
+ limit: 3,
+ data: allData.slice(0, numberOfResults),
},
- ],
+ },
results_count: 3,
parts: {
name: true,
@@ -83,36 +81,65 @@ test("searchbar triggers a search when text is entered", async () => {
expect(queryAll("form .o_search_result_item")).toHaveLength(3);
});
-test("searchbar selects first result on cursor down", async () => {
- supportAutocomplete();
+/**
+ * Test keyboard navigation in search results.
+ *
+ * Verifies that:
+ * 1. ArrowDown from input focuses the first result
+ * 2. ArrowUp from input focuses the last result
+ * 3. ArrowLeft/Right navigate horizontally within the grid
+ * 4. ArrowDown wraps around rows to next row's first column
+ */
+test("search results keyboard navigation with arrow keys", async () => {
+ supportAutocomplete(6);
await startInteractions(searchTemplate);
const inputEl = queryOne("form input[type=search]");
+
+ // Setup: Type search query to trigger autocomplete
await click(inputEl);
await press("x");
await press("y");
await press("z");
await advanceTime(400);
- const resultEls = queryAll("form a:has(.o_search_result_item)");
- expect(resultEls).toHaveLength(3);
+
+ const resultEls = queryAll("form .o_search_result_item");
+ expect(resultEls).toHaveLength(6);
expect(document.activeElement).toBe(inputEl);
+
+ // ArrowDown from input focuses first result
await press("down");
expect(document.activeElement).toBe(resultEls[0]);
-});
-test("searchbar selects last result on cursor up", async () => {
- supportAutocomplete();
- await startInteractions(searchTemplate);
- const inputEl = queryOne("form input[type=search]");
- await click(inputEl);
- await press("x");
- await press("y");
- await press("z");
- await advanceTime(400);
- const resultEls = queryAll("form a:has(.o_search_result_item)");
- expect(resultEls).toHaveLength(3);
+ // ArrowDown moves to next row, same column
+ await press("down");
+ expect(document.activeElement).toBe(resultEls[3]);
+
+ // ArrowLeft navigates to adjacent result (same row)
+ await press("right");
+ expect(document.activeElement).toBe(resultEls[4]);
+
+ // ArrowUp moves to previous row, same column
+ await press("up");
+ expect(document.activeElement).toBe(resultEls[1]);
+
+ // ArrowDown from input focuses first result
+ await press("left");
+ expect(document.activeElement).toBe(resultEls[0]);
+
+ // ArrowUp moves back to input
+ await press("up");
expect(document.activeElement).toBe(inputEl);
+
+ // ArrowUp from input focuses last result
await press("up");
- expect(document.activeElement).toBe(resultEls[2]);
+ expect(document.activeElement).toBe(resultEls[5]);
+
+ // Here element is in last row, pressing down from any position should
+ // set focus back to input
+ await press("left");
+ expect(document.activeElement).toBe(resultEls[4]);
+ await press("down");
+ expect(document.activeElement).toBe(inputEl);
});
test("searchbar removes results on escape", async () => {
@@ -123,7 +150,7 @@ test("searchbar removes results on escape", async () => {
await press("y");
await press("z");
await advanceTime(400);
- expect(queryAll("form a:has(.o_search_result_item)")).toHaveLength(3);
+ expect(queryAll("form .o_search_result_item")).toHaveLength(3);
await press("escape");
- expect(queryAll("form a:has(.o_search_result_item)")).toHaveLength(0);
+ expect(queryAll("form .o_search_result_item")).toHaveLength(0);
});
diff --git a/addons/website/tests/test_fuzzy.py b/addons/website/tests/test_fuzzy.py
index cff1a5be7366e..e8a3b30c0a108 100644
--- a/addons/website/tests/test_fuzzy.py
+++ b/addons/website/tests/test_fuzzy.py
@@ -112,9 +112,7 @@ def setUpClass(cls):
super().setUpClass()
cls.website = cls.env['website'].browse(1)
cls.WebsiteController = Website()
- cls.options = {
- 'displayDescription': True,
- }
+ cls.options = {}
cls.expectedParts = {
'name': True,
'description': True,
@@ -152,7 +150,7 @@ def _autocomplete(self, term):
if suggestions['results_count']:
self.assertDictEqual(self.expectedParts, suggestions['parts'],
f"Parts should contain {self.expectedParts.keys()}")
- for result in suggestions['results']:
+ for result in suggestions['results'].get("pages", {}).get('data', []):
self.assertEqual("fa-file-o", result['_fa'], "Expect an fa icon")
for field in suggestions['parts'].keys():
value = result[field]
@@ -218,36 +216,40 @@ def test_shorten_around_match(self):
def test_01_few_results(self):
""" Tests an autocomplete with exact match and less than the maximum number of results """
suggestions = self._autocomplete("few")
+ results = suggestions['results'].get("pages", {}).get('data', [])
self.assertEqual(2, suggestions['results_count'], "Text data contains two pages with 'few'")
- self.assertEqual(2, len(suggestions['results']), "All results must be present")
+ self.assertEqual(2, len(results), "All results must be present")
self.assertFalse(suggestions['fuzzy_search'], "Expects an exact match")
- for result in suggestions['results']:
+ for result in results:
self._check_highlight("few", result['name'])
self._check_highlight("few", result['description'])
def test_02_many_results(self):
""" Tests an autocomplete with exact match and more than the maximum number of results """
suggestions = self._autocomplete("many")
+ results = suggestions['results'].get("pages", {}).get('data', [])
self.assertEqual(6, suggestions['results_count'], "Test data contains six pages with 'many'")
- self.assertEqual(5, len(suggestions['results']), "Results must be limited to 5")
+ self.assertEqual(6, len(results), "Results must be limited to 6")
self.assertFalse(suggestions['fuzzy_search'], "Expects an exact match")
- for result in suggestions['results']:
+ for result in results:
self._check_highlight("many", result['name'])
self._check_highlight("many", result['description'])
def test_03_no_result(self):
""" Tests an autocomplete without matching results """
suggestions = self._autocomplete("nothing")
+ results = suggestions['results'].get("pages", {}).get('data', [])
self.assertEqual(0, suggestions['results_count'], "Text data contains no page with 'nothing'")
- self.assertEqual(0, len(suggestions['results']), "No result must be present")
+ self.assertEqual(0, len(results), "No result must be present")
def test_04_fuzzy_results(self):
""" Tests an autocomplete with fuzzy matching results """
suggestions = self._autocomplete("appoximtly")
+ results = suggestions['results'].get("pages", {}).get('data', [])
self.assertEqual("approximately", suggestions['fuzzy_search'], "")
self.assertEqual(1, suggestions['results_count'], "Text data contains one page with 'approximately'")
- self.assertEqual(1, len(suggestions['results']), "Single result must be present")
- for result in suggestions['results']:
+ self.assertEqual(1, len(results), "Single result must be present")
+ for result in results:
self._check_highlight("approximately", result['name'])
self._check_highlight("approximately", result['description'])
@@ -256,19 +258,21 @@ def test_05_long_url(self):
url = "/this-url-is-so-long-it-would-be-truncated-without-the-fix"
self._create_page("Too long", "Way too long URL", url)
suggestions = self._autocomplete("long url")
+ results = suggestions['results'].get("pages", {}).get('data', [])
self.assertEqual(1, suggestions['results_count'], "Text data contains one page with 'long url'")
- self.assertEqual(1, len(suggestions['results']), "Single result must be present")
- self.assertEqual(url, suggestions['results'][0]['website_url'], 'URL must not be truncated')
+ self.assertEqual(1, len(results), "Single result must be present")
+ self.assertEqual(url, results[0]['website_url'], 'URL must not be truncated')
def test_06_case_insensitive_results(self):
""" Tests an autocomplete with exact match and more than the maximum
number of results.
"""
suggestions = self._autocomplete("Many")
+ results = suggestions['results'].get("pages", {}).get('data', [])
self.assertEqual(6, suggestions['results_count'], "Test data contains six pages with 'Many'")
- self.assertEqual(5, len(suggestions['results']), "Results must be limited to 5")
+ self.assertEqual(6, len(results), "Results must be limited to 6")
self.assertFalse(suggestions['fuzzy_search'], "Expects an exact match")
- for result in suggestions['results']:
+ for result in results:
self._check_highlight("many", result['name'])
self._check_highlight("many", result['description'])
@@ -301,5 +305,6 @@ def test_09_hyphen(self):
self.assertEqual(1, suggestions['results_count'], "Text data contains one page with 'weekend'")
self.assertEqual('week-end', suggestions['fuzzy_search'], "Expects a fuzzy match")
suggestions = self._autocomplete("week-end")
- self.assertEqual(1, len(suggestions['results']), "All results must be present")
+ results = suggestions['results'].get("pages", {}).get('data', [])
+ self.assertEqual(1, len(results), "All results must be present")
self.assertFalse(suggestions['fuzzy_search'], "Expects an exact match")
diff --git a/addons/website/views/snippets/s_searchbar.xml b/addons/website/views/snippets/s_searchbar.xml
index ce1de47656189..f088efc723990 100644
--- a/addons/website/views/snippets/s_searchbar.xml
+++ b/addons/website/views/snippets/s_searchbar.xml
@@ -5,7 +5,7 @@
+
@@ -3161,15 +3161,35 @@ Sitemap: ![]()
+
+
+
+
+
+
+
+
@@ -3200,10 +3232,10 @@ Sitemap:
+
+
+
+
+
+
+
+
+
+ Search Results
-
-
-
+
+
+
+
+
+
+
+
+
+
![]()
-
+
search_type
- limit or '5'
+ limit or '6'
display_image or 'true'
display_description or 'true'
display_extra_link or 'true'
@@ -3343,7 +3375,7 @@ Sitemap:
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_blog/static/src/snippets/s_searchbar/search_bar.js b/addons/website_blog/static/src/snippets/s_searchbar/search_bar.js
new file mode 100644
index 0000000000000..b94f2ebdc9584
--- /dev/null
+++ b/addons/website_blog/static/src/snippets/s_searchbar/search_bar.js
@@ -0,0 +1,11 @@
+import { patch } from "@web/core/utils/patch";
+import { SearchBar } from "@website/snippets/s_searchbar/search_bar";
+
+patch(SearchBar.prototype, {
+ /**
+ * @override
+ */
+ getFieldsNames() {
+ return [...super.getFieldsNames(), "author_name"];
+ },
+});
diff --git a/addons/website_blog/static/src/website_builder/blog_searchbar_option_plugin.js b/addons/website_blog/static/src/website_builder/blog_searchbar_option_plugin.js
index e3a10a11d4e04..397167ccf3401 100644
--- a/addons/website_blog/static/src/website_builder/blog_searchbar_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/blog_searchbar_option_plugin.js
@@ -19,18 +19,6 @@ class BlogSearchbarOptionPlugin extends Plugin {
dependency: "search_blogs_opt",
},
],
- searchbar_option_display_items: [
- {
- label: _t("Description"),
- dataAttribute: "displayDescription",
- dependency: "search_blogs_opt",
- },
- {
- label: _t("Publication Date"),
- dataAttribute: "displayDetail",
- dependency: "search_blogs_opt",
- },
- ],
};
}
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index e826c3c748941..6d9d15bb6575a 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -422,6 +422,43 @@ list of filtered posts (by date or tag).
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_blog/views/website_searchbar_templates.xml b/addons/website_blog/views/website_searchbar_templates.xml
new file mode 100644
index 0000000000000..d31b217982e55
--- /dev/null
+++ b/addons/website_blog/views/website_searchbar_templates.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index 5bfe52fce6d42..baf66ed2dc47d 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -33,6 +33,7 @@
'views/event_type_views.xml',
'views/website_event_menu_views.xml',
'views/website_visitor_views.xml',
+ 'views/website_searchbar_templates.xml',
'views/event_menus.xml',
'views/website_pages_views.xml',
'views/event_event_add.xml',
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 1642317e0ece3..7ffdcadf8696c 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -30,11 +30,6 @@ def sitemap_event(env, rule, qs):
def _get_events_search_options(self, slug_tags, **post):
return {
- 'displayDescription': True,
- 'displayDetail': False,
- 'displayExtraDetail': False,
- 'displayExtraLink': False,
- 'displayImage': False,
'allowFuzzy': not post.get('noFuzzy'),
'date': post.get('date'),
'tags': slug_tags or post.get('tags'),
diff --git a/addons/website_event/models/event_event.py b/addons/website_event/models/event_event.py
index 47782673a91cd..0b5d018ae20b3 100644
--- a/addons/website_event/models/event_event.py
+++ b/addons/website_event/models/event_event.py
@@ -559,8 +559,6 @@ def get_month_filter_domain(filter_name, months_delta):
@api.model
def _search_get_detail(self, website, order, options):
- with_description = options['displayDescription']
- with_date = options['displayDetail']
date = options.get('date', 'all')
country = options.get('country')
tags = options.get('tags')
@@ -610,20 +608,17 @@ def _search_get_detail(self, website, order, options):
if date_details[0] != 'scheduled':
current_date = date_details[1]
- search_fields = ['name', 'tag_ids.name']
- fetch_fields = ['name', 'website_url', 'address_name', 'tag_ids']
+ search_fields = ['name', 'tag_ids.name', 'subtitle', 'tag_ids.name']
+ fetch_fields = ['name', 'website_url', 'address_name', 'date_begin', 'tag_ids']
mapping = {
'name': {'name': 'name', 'type': 'text', 'match': True},
'website_url': {'name': 'website_url', 'type': 'text', 'truncate': False},
'address_name': {'name': 'address_name', 'type': 'text', 'match': True},
- 'tags': {'name': 'tag_ids', 'type': 'tags', 'match': True}
+ 'date_begin': {'name': 'date_begin', 'type': 'date'},
+ 'lowest_ticket_price': {'name': 'lowest_ticket_price', 'type': 'html'},
+ 'image_url': {'name': 'image_url', 'type': 'html'},
+ 'tags': {'name': 'tag_ids', 'type': 'tags', 'match': True},
}
- if with_description:
- search_fields.append('subtitle')
- fetch_fields.append('subtitle')
- mapping['description'] = {'name': 'subtitle', 'type': 'text', 'match': True}
- if with_date:
- mapping['detail'] = {'name': 'range', 'type': 'html'}
# Bypassing the access rigths of partner to search the address.
def search_in_address(env, search_term):
@@ -646,18 +641,45 @@ def search_in_address(env, search_term):
'search_tags': search_tags,
'no_date_domain': no_date_domain,
'no_country_domain': no_country_domain,
+ 'template_key': 'website_event.search_items_event',
+ 'group_name': self.env._("Events"),
+ 'sequence': 40,
}
+ def _get_lowest_ticket_price(self):
+ # Exit early if the price field does not exist
+ if 'price' not in self.env["event.event.ticket"]._fields:
+ return False
+
+ prices = [
+ ticket.price
+ for ticket in self.event_ticket_ids
+ if ticket.price is not None
+ ]
+
+ if not prices:
+ return False
+ price = min(prices)
+ # Zero means free → highest priority
+ if price == 0.0:
+ return Markup("Free")
+
+ currency = self.currency_id or self.env.company.currency_id
+ return self.env['ir.qweb.field.monetary'].value_to_html(
+ price,
+ {'display_currency': currency}
+ )
+
def _search_render_results(self, fetch_fields, mapping, icon, limit):
- with_date = 'detail' in mapping
results_data = super()._search_render_results(fetch_fields, mapping, icon, limit)
for event, data in zip(self, results_data):
- if with_date:
- begin = self.env['ir.qweb.field.date'].record_to_html(event, 'date_begin', {})
- end = self.env['ir.qweb.field.date'].record_to_html(event, 'date_end', {})
- data['range'] = (
- Markup('{} {}').format(begin, end)
- if begin != end else begin
- )
+ begin = self.env['ir.qweb.field.date'].record_to_html(event, 'date_begin', {})
+ end = self.env['ir.qweb.field.date'].record_to_html(event, 'date_end', {})
+ data['range'] = (
+ Markup('{} {}').format(begin, end)
+ if begin != end else begin
+ )
data['tag_ids'] = event.tag_ids.read(['name'])
+ data['lowest_ticket_price'] = event._get_lowest_ticket_price()
+ data['image_url'] = event._get_image_url()
return results_data
diff --git a/addons/website_event/static/src/snippets/s_searchbar/000.xml b/addons/website_event/static/src/snippets/s_searchbar/000.xml
index 9ee90a8622709..3b7c091531250 100644
--- a/addons/website_event/static/src/snippets/s_searchbar/000.xml
+++ b/addons/website_event/static/src/snippets/s_searchbar/000.xml
@@ -2,13 +2,36 @@
-
-
-
-
+
+
+
+
-
diff --git a/addons/website_event/static/src/snippets/s_searchbar/search_bar.js b/addons/website_event/static/src/snippets/s_searchbar/search_bar.js
index d14d27eab08c5..79066f9b5093f 100644
--- a/addons/website_event/static/src/snippets/s_searchbar/search_bar.js
+++ b/addons/website_event/static/src/snippets/s_searchbar/search_bar.js
@@ -3,6 +3,6 @@ import { SearchBar } from "@website/snippets/s_searchbar/search_bar";
patch(SearchBar.prototype, {
getFieldsNames() {
- return [...super.getFieldsNames(), "address_name"];
+ return [...super.getFieldsNames(), "address_name", "date_begin", "lowest_ticket_price"];
}
});
diff --git a/addons/website_event/static/src/website_builder/event_searchbar_option_plugin.js b/addons/website_event/static/src/website_builder/event_searchbar_option_plugin.js
index 0443b85a22d54..bd36b514762c0 100644
--- a/addons/website_event/static/src/website_builder/event_searchbar_option_plugin.js
+++ b/addons/website_event/static/src/website_builder/event_searchbar_option_plugin.js
@@ -18,18 +18,6 @@ class EventSearchbarOptionPlugin extends Plugin {
dependency: "search_events_opt",
},
],
- searchbar_option_display_items: [
- {
- label: _t("Description"),
- dataAttribute: "displayDescription",
- dependency: "search_events_opt",
- },
- {
- label: _t("Event Date"),
- dataAttribute: "displayDetail",
- dependency: "search_events_opt",
- },
- ],
};
}
diff --git a/addons/website_event/tests/test_fuzzy.py b/addons/website_event/tests/test_fuzzy.py
index 4f1890ffbaccb..fc119fa69249f 100644
--- a/addons/website_event/tests/test_fuzzy.py
+++ b/addons/website_event/tests/test_fuzzy.py
@@ -26,10 +26,6 @@ def test_autocomplete_search_for_multiple_spaces(self):
options = {
"allowFuzzy": True,
"display_currency": request.website.company_id.currency_id.id,
- "displayDescription": True,
- "displayDetail": False,
- "displayExtraLink": True,
- "displayImage": True,
"order": "name asc",
}
result = self.WebsiteController.autocomplete(
diff --git a/addons/website_event/tests/test_website_event.py b/addons/website_event/tests/test_website_event.py
index 5588d77f9029a..b75de07cd3571 100644
--- a/addons/website_event/tests/test_website_event.py
+++ b/addons/website_event/tests/test_website_event.py
@@ -307,7 +307,7 @@ def test_sitemap(self):
@users('user_portal')
def test_check_search_in_address(self):
ret = self.env['event.event']._search_get_detail(
- self.website, order=None, options={'displayDescription':'', 'displayDetail':''}
+ self.website, order=None, options={}
)
result = ret['search_extra'](self.env, 'Turlock')[0][-1].get_result_ids()
self.assertEqual(*result, self.events[0].id, 'Event should exist for the searched term')
diff --git a/addons/website_event/views/event_templates_page.xml b/addons/website_event/views/event_templates_page.xml
index 31925f9b33133..6350663fa3728 100644
--- a/addons/website_event/views/event_templates_page.xml
+++ b/addons/website_event/views/event_templates_page.xml
@@ -105,4 +105,36 @@
+
+
+
+
+
+
diff --git a/addons/website_event/views/website_searchbar_templates.xml b/addons/website_event/views/website_searchbar_templates.xml
new file mode 100644
index 0000000000000..d244c6db5f365
--- /dev/null
+++ b/addons/website_event/views/website_searchbar_templates.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_event_exhibitor/__manifest__.py b/addons/website_event_exhibitor/__manifest__.py
index b313ee9a1d7f0..42ffcabd5d1aa 100644
--- a/addons/website_event_exhibitor/__manifest__.py
+++ b/addons/website_event_exhibitor/__manifest__.py
@@ -33,6 +33,7 @@
'website_event_exhibitor/static/src/scss/event_templates_sponsor.scss',
'website_event_exhibitor/static/src/scss/event_exhibitor_templates.scss',
'website_event_exhibitor/static/src/interactions/**/*',
+ 'website_event_exhibitor/static/src/snippets/**/*.xml',
'website_event_exhibitor/static/src/components/exhibitor_connect_closed_dialog/**/*',
],
'web.report_assets_common': [
diff --git a/addons/website_event_exhibitor/models/event_sponsor.py b/addons/website_event_exhibitor/models/event_sponsor.py
index 58ff386959bec..8faf14217d370 100644
--- a/addons/website_event_exhibitor/models/event_sponsor.py
+++ b/addons/website_event_exhibitor/models/event_sponsor.py
@@ -189,6 +189,8 @@ def _search_get_detail(self, website, order, options):
'mapping': mapping,
'icon': 'fa-black-tie',
'order': order,
+ 'template_key': 'website_event_exhibitor.search_items_event_sponsor',
+ 'group_name': self.env._("Sponsors"),
}
# ------------------------------------------------------------
diff --git a/addons/website_event_exhibitor/models/website.py b/addons/website_event_exhibitor/models/website.py
index f1a82db33ea5d..6d5132cd81d9a 100644
--- a/addons/website_event_exhibitor/models/website.py
+++ b/addons/website_event_exhibitor/models/website.py
@@ -6,6 +6,6 @@ class Website(models.Model):
def _search_get_details(self, search_type, order, options):
result = super()._search_get_details(search_type, order, options)
- if search_type in ['sponsor', 'all'] and options.get('event'):
+ if search_type == 'sponsor':
result.append(self.env['event.sponsor']._search_get_detail(self, order, options))
return result
diff --git a/addons/website_event_exhibitor/static/src/snippets/s_searchbar/000.xml b/addons/website_event_exhibitor/static/src/snippets/s_searchbar/000.xml
new file mode 100644
index 0000000000000..8333659f2b8d8
--- /dev/null
+++ b/addons/website_event_exhibitor/static/src/snippets/s_searchbar/000.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
diff --git a/addons/website_event_track/__manifest__.py b/addons/website_event_track/__manifest__.py
index 0b26a31bac695..de2f14ca0e7f2 100644
--- a/addons/website_event_track/__manifest__.py
+++ b/addons/website_event_track/__manifest__.py
@@ -30,7 +30,6 @@
'views/res_config_settings_view.xml',
'views/website_visitor_views.xml',
'views/event_menus.xml',
- 'views/snippets.xml',
],
'demo': [
'data/event_demo.xml',
@@ -50,6 +49,7 @@
'website_event_track/static/src/xml/website_event_pwa.xml',
'website_event_track/static/src/xml/website_event_track_form_tags_wrapper.xml',
'website_event_track/static/src/xml/website_event_track_email_reminder.xml',
+ 'website_event_track/static/src/snippets/**/*.xml',
'website_event_track/static/src/snippets/**/*.js',
'website_event_track/static/src/interactions/*',
],
diff --git a/addons/website_event_track/models/event_track.py b/addons/website_event_track/models/event_track.py
index b632b820aa138..0407cf64b52e6 100644
--- a/addons/website_event_track/models/event_track.py
+++ b/addons/website_event_track/models/event_track.py
@@ -515,6 +515,8 @@ def _search_get_detail(self, website, order, options):
'mapping': mapping,
'icon': 'fa-microphone',
'order': order,
+ 'template_key': 'website_event_track.search_items_event_track',
+ 'group_name': self.env._("Talks"),
}
# ------------------------------------------------------------
diff --git a/addons/website_event_track/models/website.py b/addons/website_event_track/models/website.py
index 66820a4ae2c9c..d09632372bd03 100644
--- a/addons/website_event_track/models/website.py
+++ b/addons/website_event_track/models/website.py
@@ -60,6 +60,6 @@ def _compute_app_icon(self):
def _search_get_details(self, search_type, order, options):
result = super()._search_get_details(search_type, order, options)
- if search_type in ['track', 'all'] and options.get('event'):
+ if search_type == 'track':
result.append(self.env['event.track']._search_get_detail(self, order, options))
return result
diff --git a/addons/website_event_track/static/src/snippets/s_searchbar/000.xml b/addons/website_event_track/static/src/snippets/s_searchbar/000.xml
index 1ada48fe0c384..21b972f3a1b73 100644
--- a/addons/website_event_track/static/src/snippets/s_searchbar/000.xml
+++ b/addons/website_event_track/static/src/snippets/s_searchbar/000.xml
@@ -1,11 +1,18 @@
-
-
-
-
+
+
+
diff --git a/addons/website_event_track/views/snippets.xml b/addons/website_event_track/views/snippets.xml
deleted file mode 100644
index c894da65818b3..0000000000000
--- a/addons/website_event_track/views/snippets.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- web.assets_frontend
- website_event_track/static/src/snippets/s_searchbar/000.xml
-
-
-
diff --git a/addons/website_forum/__manifest__.py b/addons/website_forum/__manifest__.py
index e7c2eabfd0ee8..c4be389156747 100644
--- a/addons/website_forum/__manifest__.py
+++ b/addons/website_forum/__manifest__.py
@@ -43,6 +43,7 @@
'views/forum_forum_templates_tools.xml',
'views/forum_templates_mail.xml',
'views/website_profile_templates.xml',
+ 'views/website_searchbar_templates.xml',
'security/ir.model.access.csv',
'security/ir_rule_data.xml',
@@ -75,6 +76,7 @@
'website_forum/static/src/xml/website_forum_tags_wrapper.xml',
'website_forum/static/src/components/**/*',
'website_forum/static/src/plugins/**/*',
+ 'website_forum/static/src/snippets/**/*',
],
'web.assets_unit_tests': [
'website_forum/static/tests/interactions/**/*',
diff --git a/addons/website_forum/controllers/website_forum.py b/addons/website_forum/controllers/website_forum.py
index c92cc0266ea2d..b2953bb3f6435 100644
--- a/addons/website_forum/controllers/website_forum.py
+++ b/addons/website_forum/controllers/website_forum.py
@@ -101,11 +101,6 @@ def _get_forum_post_search_options(self, forum=None, tag=None, filters=None, my=
return {
'allowFuzzy': not post.get('noFuzzy'),
'create_uid': create_uid,
- 'displayDescription': False,
- 'displayDetail': False,
- 'displayExtraDetail': False,
- 'displayExtraLink': False,
- 'displayImage': False,
'filters': filters,
'forum': str(forum.id) if forum else None,
'include_answers': include_answers,
diff --git a/addons/website_forum/models/forum_forum.py b/addons/website_forum/models/forum_forum.py
index 6008448f15837..e6ba37b30ff35 100644
--- a/addons/website_forum/models/forum_forum.py
+++ b/addons/website_forum/models/forum_forum.py
@@ -320,18 +320,15 @@ def go_to_website(self):
@api.model
def _search_get_detail(self, website, order, options):
- with_description = options['displayDescription']
- search_fields = ['name', 'tag_ids.name']
- fetch_fields = ['id', 'name', 'tag_ids']
+ search_fields = ['name', 'tag_ids.name', 'description']
+ fetch_fields = ['id', 'name', 'tag_ids', 'description']
mapping = {
'name': {'name': 'name', 'type': 'text', 'match': True},
'website_url': {'name': 'website_url', 'type': 'text', 'truncate': False},
+ 'image_url': {'name': 'image_url', 'type': 'html'},
'tags': {'name': 'tag_ids', 'type': 'tags', 'match': True},
+ 'description': {'name': 'description', 'type': 'text', 'truncate': True},
}
- if with_description:
- search_fields.append('description')
- fetch_fields.append('description')
- mapping['description'] = {'name': 'description', 'type': 'text', 'match': True}
return {
'model': 'forum.forum',
'base_domain': [website.website_domain()],
@@ -340,6 +337,9 @@ def _search_get_detail(self, website, order, options):
'mapping': mapping,
'icon': 'fa-comments-o',
'order': 'name desc, id desc' if 'name desc' in order else 'name asc, id desc',
+ 'template_key': 'website_forum.search_items_forum',
+ 'group_name': self.env._("Forum"),
+ 'sequence': 140,
}
def _search_render_results(self, fetch_fields, mapping, icon, limit):
@@ -347,4 +347,5 @@ def _search_render_results(self, fetch_fields, mapping, icon, limit):
for forum, data in zip(self, results_data):
data['website_url'] = forum.website_url
data['tag_ids'] = forum.tag_ids.read(['name'])
+ data['image_url'] = 'web/image/forum.forum/%s/image_128' % data['id']
return results_data
diff --git a/addons/website_forum/models/forum_post.py b/addons/website_forum/models/forum_post.py
index f13d97701a0a5..2cf850169a707 100644
--- a/addons/website_forum/models/forum_post.py
+++ b/addons/website_forum/models/forum_post.py
@@ -851,14 +851,15 @@ def go_to_website(self):
@api.model
def _search_get_detail(self, website, order, options):
- with_description = options['displayDescription']
- with_date = options['displayDetail']
- search_fields = ['name', 'tag_ids.name']
- fetch_fields = ['id', 'name', 'website_url', 'tag_ids']
+ search_fields = ['name', 'tag_ids.name', 'content']
+ fetch_fields = ['id', 'name', 'tag_ids', 'website_url', 'content', 'write_date']
mapping = {
'name': {'name': 'name', 'type': 'text', 'match': True},
'website_url': {'name': 'website_url', 'type': 'text', 'truncate': False},
'tags': {'name': 'tag_ids', 'type': 'tags', 'match': True},
+ 'description': {'name': 'content', 'type': 'text', 'html': True, 'match': True},
+ 'date': {'name': 'write_date', 'type': 'date'},
+ 'image_url': {'name': 'image_url', 'type': 'html'},
}
domain = website.website_domain()
@@ -899,13 +900,6 @@ def _search_get_detail(self, website, order, options):
parts = [part for part in order.split(',') if 'is_published' not in part]
order = ','.join(parts)
- if with_description:
- search_fields.append('content')
- fetch_fields.append('content')
- mapping['description'] = {'name': 'content', 'type': 'text', 'html': True, 'match': True}
- if with_date:
- fetch_fields.append('write_date')
- mapping['detail'] = {'name': 'date', 'type': 'html'}
return {
'model': 'forum.post',
'base_domain': [domain],
@@ -914,15 +908,16 @@ def _search_get_detail(self, website, order, options):
'mapping': mapping,
'icon': 'fa-comment-o',
'order': order,
+ 'template_key': 'website_forum.search_items_forum_post',
+ 'group_name': self.env._("Forum Post"),
+ 'sequence': 130,
}
def _search_render_results(self, fetch_fields, mapping, icon, limit):
- with_date = 'detail' in mapping
results_data = super()._search_render_results(fetch_fields, mapping, icon, limit)
for post, data in zip(self, results_data):
- if with_date:
- data['date'] = self.env['ir.qweb.field.date'].record_to_html(post, 'write_date', {})
data['tag_ids'] = post.tag_ids.read(['name'])
+ data['image_url'] = self.env['website'].image_url(post.create_uid, 'avatar_128')
return results_data
def _get_related_posts(self, limit=5):
diff --git a/addons/website_forum/models/forum_tag.py b/addons/website_forum/models/forum_tag.py
index 494f573c716ba..cc1872a1f56df 100644
--- a/addons/website_forum/models/forum_tag.py
+++ b/addons/website_forum/models/forum_tag.py
@@ -44,30 +44,3 @@ def create(self, vals_list):
if self.env.user.karma < forum.karma_tag_create and not self.env.is_admin():
raise AccessError(_('%d karma required to create a new Tag.', forum.karma_tag_create))
return super(ForumTag, self.with_context(mail_create_nolog=True, mail_create_nosubscribe=True)).create(vals_list)
-
- # ----------------------------------------------------------------------
- # WEBSITE
- # ----------------------------------------------------------------------
-
- @api.model
- def _search_get_detail(self, website, order, options):
- search_fields = ['name']
- fetch_fields = ['id', 'name', 'website_url']
- mapping = {
- 'name': {'name': 'name', 'type': 'text', 'match': True},
- 'website_url': {'name': 'website_url', 'type': 'text', 'truncate': False},
- }
- base_domain = []
- if forum := options.get("forum"):
- forum_ids = (self.env['ir.http']._unslug(forum)[1],) if isinstance(forum, str) else forum.ids
- search_domain = options.get("domain")
- base_domain = [search_domain if search_domain is not None else [('forum_id', 'in', forum_ids)]]
- return {
- 'model': 'forum.tag',
- 'base_domain': base_domain,
- 'search_fields': search_fields,
- 'fetch_fields': fetch_fields,
- 'mapping': mapping,
- 'icon': 'fa-tag',
- 'order': ','.join(filter(lambda f: 'is_published' not in f, order.split(','))),
- }
diff --git a/addons/website_forum/models/website.py b/addons/website_forum/models/website.py
index 2e098303381a6..a731101456dc2 100644
--- a/addons/website_forum/models/website.py
+++ b/addons/website_forum/models/website.py
@@ -37,8 +37,6 @@ def _search_get_details(self, search_type, order, options):
result.append(self.env['forum.forum']._search_get_detail(self, order, options))
if search_type in ['forums', 'forum_posts_only', 'all']:
result.append(self.env['forum.post']._search_get_detail(self, order, options))
- if search_type in ['forums', 'forum_tags_only', 'all']:
- result.append(self.env['forum.tag']._search_get_detail(self, order, options))
return result
def _update_forum_count(self):
diff --git a/addons/website_forum/static/src/snippets/s_searchbar/000.xml b/addons/website_forum/static/src/snippets/s_searchbar/000.xml
new file mode 100644
index 0000000000000..6538159763c45
--- /dev/null
+++ b/addons/website_forum/static/src/snippets/s_searchbar/000.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_forum/static/src/website_builder/forum_searchbar_option_plugin.js b/addons/website_forum/static/src/website_builder/forum_searchbar_option_plugin.js
index c329c07ea13ef..5061d558724d1 100644
--- a/addons/website_forum/static/src/website_builder/forum_searchbar_option_plugin.js
+++ b/addons/website_forum/static/src/website_builder/forum_searchbar_option_plugin.js
@@ -18,18 +18,6 @@ class ForumSearchbarOptionPlugin extends Plugin {
dependency: "search_forums_opt",
},
],
- searchbar_option_display_items: [
- {
- label: _t("Description"),
- dataAttribute: "displayDescription",
- dependency: "search_forums_opt",
- },
- {
- label: _t("Date"),
- dataAttribute: "displayDetail",
- dependency: "search_forums_opt",
- },
- ],
};
}
diff --git a/addons/website_forum/views/website_searchbar_templates.xml b/addons/website_forum/views/website_searchbar_templates.xml
new file mode 100644
index 0000000000000..45a972dc9f90b
--- /dev/null
+++ b/addons/website_forum/views/website_searchbar_templates.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_hr_recruitment/__manifest__.py b/addons/website_hr_recruitment/__manifest__.py
index 28cd64347fad4..4b7b2b3442a2e 100644
--- a/addons/website_hr_recruitment/__manifest__.py
+++ b/addons/website_hr_recruitment/__manifest__.py
@@ -13,6 +13,7 @@
'security/website_hr_recruitment_security.xml',
'data/config_data.xml',
'views/website_hr_recruitment_templates.xml',
+ 'views/website_searchbar_templates.xml',
'views/hr_recruitment_views.xml',
'views/hr_job_views.xml',
'views/website_pages_views.xml',
@@ -26,6 +27,8 @@
'web.assets_frontend': [
'website_hr_recruitment/static/src/scss/**/*',
'website_hr_recruitment/static/src/interactions/*',
+ 'website_hr_recruitment/static/src/snippets/**/*.xml',
+ 'website_hr_recruitment/static/src/snippets/**/*.js',
],
'web.assets_backend': [
'website_hr_recruitment/static/src/js/widgets/copy_link_menuitem.js',
diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py
index ecc3eab580822..522f21391028d 100644
--- a/addons/website_hr_recruitment/controllers/main.py
+++ b/addons/website_hr_recruitment/controllers/main.py
@@ -134,7 +134,6 @@ def to_int(query_arg):
limit=self._jobs_per_page * 50,
order="is_published desc, sequence, no_of_recruitment desc",
options={
- 'displayDescription': True,
'allowFuzzy': not noFuzzy,
}
)
diff --git a/addons/website_hr_recruitment/models/hr_job.py b/addons/website_hr_recruitment/models/hr_job.py
index 325ad5d22dd85..551d5e484c2c4 100644
--- a/addons/website_hr_recruitment/models/hr_job.py
+++ b/addons/website_hr_recruitment/models/hr_job.py
@@ -83,7 +83,6 @@ def action_archive(self):
@api.model
def _search_get_detail(self, website, order, options):
requires_sudo = False
- with_description = options['displayDescription']
country_id = options.get('country_id')
department_id = options.get('department_id')
office_id = options.get('office_id')
@@ -113,17 +112,15 @@ def _search_get_detail(self, website, order, options):
# Rule must be reinforced because of sudo.
domain.append([('website_published', '=', True)])
-
- search_fields = ['name']
- fetch_fields = ['name', 'website_url']
+ search_fields = ['name', 'description']
+ fetch_fields = ['name', 'website_url', 'no_of_recruitment']
mapping = {
'name': {'name': 'name', 'type': 'text', 'match': True},
- 'website_url': {'name': 'website_url', 'type': 'text', 'truncate': False},
+ 'website_url': {'name': 'website_url', 'type': 'text', 'truncate': False},
+ 'department_name': {'name': 'department_name', 'type': 'text'},
+ 'no_of_recruitment': {'name': 'no_of_recruitment', 'type': 'integer'},
+ 'address': {'name': 'address', 'type': 'text'},
}
- if with_description:
- search_fields.append('description')
- fetch_fields.append('description')
- mapping['description'] = {'name': 'description', 'type': 'text', 'html': True, 'match': True}
return {
'model': 'hr.job',
'requires_sudo': requires_sudo,
@@ -132,4 +129,15 @@ def _search_get_detail(self, website, order, options):
'fetch_fields': fetch_fields,
'mapping': mapping,
'icon': 'fa-briefcase',
+ 'template_key': 'website_hr_recruitment.search_items_jobs',
+ 'group_name': self.env._("Jobs"),
+ 'sequence': 100,
}
+
+ def _search_render_results(self, fetch_fields, mapping, icon, limit):
+ results_data = super()._search_render_results(fetch_fields, mapping, icon, limit)
+ for data in results_data:
+ job = self.browse(data['id'])
+ data['department_name'] = job.department_id.name or ''
+ data['address'] = job.address_id.name or ''
+ return results_data
diff --git a/addons/website_hr_recruitment/static/src/snippets/s_searchbar/000.xml b/addons/website_hr_recruitment/static/src/snippets/s_searchbar/000.xml
new file mode 100644
index 0000000000000..1cbf2d3707ae1
--- /dev/null
+++ b/addons/website_hr_recruitment/static/src/snippets/s_searchbar/000.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_hr_recruitment/static/src/snippets/s_searchbar/search_bar.js b/addons/website_hr_recruitment/static/src/snippets/s_searchbar/search_bar.js
new file mode 100644
index 0000000000000..7aa1ea864596a
--- /dev/null
+++ b/addons/website_hr_recruitment/static/src/snippets/s_searchbar/search_bar.js
@@ -0,0 +1,11 @@
+import { patch } from "@web/core/utils/patch";
+import { SearchBar } from "@website/snippets/s_searchbar/search_bar";
+
+patch(SearchBar.prototype, {
+ /**
+ * @override
+ */
+ getFieldsNames() {
+ return [...super.getFieldsNames(), "department_name", "address"];
+ },
+})
diff --git a/addons/website_hr_recruitment/static/src/website_builder/website_hr_recruitment_searchbar_option_plugin.js b/addons/website_hr_recruitment/static/src/website_builder/website_hr_recruitment_searchbar_option_plugin.js
deleted file mode 100644
index 32b3791eaef65..0000000000000
--- a/addons/website_hr_recruitment/static/src/website_builder/website_hr_recruitment_searchbar_option_plugin.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Plugin } from "@html_editor/plugin";
-import { _t } from "@web/core/l10n/translation";
-import { registry } from "@web/core/registry";
-
-class HrRecruitmentSearchbarOptionPlugin extends Plugin {
- static id = "hrRecruitmentSearchbarOption";
-
- resources = {
- searchbar_option_display_items: {
- label: _t("Description"),
- dataAttribute: "displayDescription",
- dependency: "search_jobs_opt",
- },
- };
-}
-
-registry
- .category("website-plugins")
- .add(HrRecruitmentSearchbarOptionPlugin.id, HrRecruitmentSearchbarOptionPlugin);
diff --git a/addons/website_hr_recruitment/views/website_searchbar_templates.xml b/addons/website_hr_recruitment/views/website_searchbar_templates.xml
new file mode 100644
index 0000000000000..0494bd3e2d783
--- /dev/null
+++ b/addons/website_hr_recruitment/views/website_searchbar_templates.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
index b9ff351317fa9..110513ed4c872 100644
--- a/addons/website_sale/__manifest__.py
+++ b/addons/website_sale/__manifest__.py
@@ -37,6 +37,7 @@
'templates/shop_page_templates.xml',
'templates/svg_templates.xml',
'templates/website_templates.xml',
+ 'templates/website_searchbar_templates.xml',
# Qweb templates -> checkout
'templates/checkout/checkout_templates.xml', # Shared templates first
@@ -97,6 +98,7 @@
'web.assets_frontend': [
'website_sale/static/src/interactions/**/*',
'website_sale/static/src/snippets/**/*.js',
+ 'website_sale/static/src/snippets/**/*.xml',
'website_sale/static/src/js/tours/tour_utils.js',
'website_sale/static/src/scss/product_tile.scss',
'website_sale/static/src/scss/website_sale.scss',
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index a28fe4b225573..91f3e503f79ee 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -227,11 +227,6 @@ def _get_search_options(
**post,
):
return {
- 'displayDescription': True,
- 'displayDetail': True,
- 'displayExtraDetail': True,
- 'displayExtraLink': True,
- 'displayImage': True,
'allowFuzzy': not post.get('noFuzzy'),
'category': str(category.id) if category else None,
'tags': tags,
diff --git a/addons/website_sale/models/product_public_category.py b/addons/website_sale/models/product_public_category.py
index 6136adaafad0a..81d6792c5ac7e 100644
--- a/addons/website_sale/models/product_public_category.py
+++ b/addons/website_sale/models/product_public_category.py
@@ -144,17 +144,14 @@ def _search_has_published_products(self, operator, value):
@api.model
def _search_get_detail(self, website, order, options):
- with_description = options['displayDescription']
- search_fields = ['name']
- fetch_fields = ['id', 'name']
+ search_fields = ['name', 'website_description']
+ fetch_fields = ['id', 'name', 'parents_and_self']
mapping = {
'name': {'name': 'name', 'type': 'text', 'match': True},
'website_url': {'name': 'url', 'type': 'text', 'truncate': False},
+ 'breadcrumb': {'name': 'breadcrumb', 'type': 'text', 'truncate': False},
+ 'image_url': {'name': 'image_url', 'type': 'html'},
}
- if with_description:
- search_fields.append('website_description')
- fetch_fields.append('website_description')
- mapping['description'] = {'name': 'website_description', 'type': 'text', 'match': True, 'html': True}
return {
'model': 'product.public.category',
'base_domain': [website.website_domain()],
@@ -163,12 +160,22 @@ def _search_get_detail(self, website, order, options):
'mapping': mapping,
'icon': 'fa-folder-o',
'order': 'name desc, id desc' if 'name desc' in order else 'name asc, id desc',
+ 'template_key': 'website_sale.search_items_product_category',
+ 'group_name': self.env._("Categories"),
+ 'sequence': 30,
}
def _search_render_results(self, fetch_fields, mapping, icon, limit):
results_data = super()._search_render_results(fetch_fields, mapping, icon, limit)
+ product_category_model = self.env['product.public.category']
for data in results_data:
data['url'] = '/shop/category/%s' % data['id']
+ data['image_url'] = '/web/image/product.public.category/%s/image_128' % data['id']
+ category_ids = data.get('parents_and_self', [])
+ if category_ids and len(category_ids) > 1:
+ category_names = product_category_model.browse(category_ids).mapped('name')
+ data['breadcrumb'] = " > ".join(category_names)
+
return results_data
@api.model
diff --git a/addons/website_sale/models/product_template.py b/addons/website_sale/models/product_template.py
index ae2cbbe430e23..0296c85095758 100644
--- a/addons/website_sale/models/product_template.py
+++ b/addons/website_sale/models/product_template.py
@@ -848,10 +848,6 @@ def _get_attribute_value_domain(self, attribute_value_dict):
@api.model
def _search_get_detail(self, website, order, options):
- with_image = options['displayImage']
- with_description = options['displayDescription']
- with_category = options['displayExtraLink']
- with_price = options['displayDetail']
domains = [website.sale_product_domain()]
category = options.get('category')
tags = options.get('tags')
@@ -874,28 +870,17 @@ def _search_get_detail(self, website, order, options):
domains.append([('list_price', '<=', max_price)])
if attribute_value_dict:
domains.extend(self._get_attribute_value_domain(attribute_value_dict))
- search_fields = ['name', 'default_code', 'variants_default_code']
- fetch_fields = ['id', 'name', 'website_url']
+ search_fields = ['name', 'default_code', 'variants_default_code', 'description', 'description_sale']
+ fetch_fields = ['id', 'name', 'website_url', 'rating_avg', 'description_sale']
mapping = {
'name': {'name': 'name', 'type': 'text', 'match': True},
- 'default_code': {'name': 'default_code', 'type': 'text', 'match': True},
- 'product_variant_ids.default_code': {'name': 'product_variant_ids.default_code', 'type': 'text', 'match': True},
'website_url': {'name': 'website_url', 'type': 'text', 'truncate': False},
+ 'rating': {'name': 'rating_avg', 'type': 'float', 'precision': 1},
+ 'extra_link': {'name': 'category', 'type': 'html'},
+ 'image_url': {'name': 'image_url', 'type': 'html'},
+ 'price': {'name': 'price', 'type': 'html', 'display_currency': options['display_currency']},
+ 'list_price': {'name': 'list_price', 'type': 'html', 'display_currency': options['display_currency']}
}
- if with_image:
- mapping['image_url'] = {'name': 'image_url', 'type': 'html'}
- if with_description:
- # Internal note is not part of the rendering.
- search_fields.append('description')
- fetch_fields.append('description')
- search_fields.append('description_sale')
- fetch_fields.append('description_sale')
- mapping['description'] = {'name': 'description_sale', 'type': 'text', 'match': True}
- if with_price:
- mapping['detail'] = {'name': 'price', 'type': 'html', 'display_currency': options['display_currency']}
- mapping['detail_strike'] = {'name': 'list_price', 'type': 'html', 'display_currency': options['display_currency']}
- if with_category:
- mapping['extra_link'] = {'name': 'category', 'type': 'html'}
return {
'model': 'product.template',
'base_domain': domains,
@@ -903,12 +888,15 @@ def _search_get_detail(self, website, order, options):
'fetch_fields': fetch_fields,
'mapping': mapping,
'icon': 'fa-shopping-cart',
+ 'template_key': 'website_sale.search_items_product',
+ 'group_name': self.env._("Products"),
+ 'sequence': 20,
}
def _search_render_results(self, fetch_fields, mapping, icon, limit):
with_image = 'image_url' in mapping
with_category = 'extra_link' in mapping
- with_price = 'detail' in mapping
+ with_price = 'price' in mapping
results_data = super()._search_render_results(fetch_fields, mapping, icon, limit)
current_website = self.env['website'].get_current_website()
for product, data in zip(self, results_data):
@@ -924,7 +912,7 @@ def _search_render_results(self, fetch_fields, mapping, icon, limit):
if with_image:
data['image_url'] = '/web/image/product.template/%s/image_128' % data['id']
if with_category and categ_ids:
- data['category'] = self.env['ir.ui.view'].sudo()._render_template(
+ data['category'] = self.env['ir.ui.view']._render_template(
"website_sale.product_category_extra_link",
{
'categories': categ_ids,
@@ -938,7 +926,7 @@ def _search_render_results_prices(self, mapping, combination_info):
if combination_info.get('prevent_zero_price_sale'):
return None, None
- monetary_options = {'display_currency': mapping['detail']['display_currency']}
+ monetary_options = {'display_currency': mapping['price']['display_currency']}
price = self.env['ir.qweb.field.monetary'].value_to_html(
combination_info['price'], monetary_options
)
diff --git a/addons/website_sale/static/src/snippets/s_searchbar/000.xml b/addons/website_sale/static/src/snippets/s_searchbar/000.xml
new file mode 100644
index 0000000000000..d0c96b16fcfaf
--- /dev/null
+++ b/addons/website_sale/static/src/snippets/s_searchbar/000.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_sale/static/src/snippets/s_searchbar/search_bar.js b/addons/website_sale/static/src/snippets/s_searchbar/search_bar.js
new file mode 100644
index 0000000000000..aa10785df2ce5
--- /dev/null
+++ b/addons/website_sale/static/src/snippets/s_searchbar/search_bar.js
@@ -0,0 +1,11 @@
+import { patch } from "@web/core/utils/patch";
+import { SearchBar } from "@website/snippets/s_searchbar/search_bar";
+
+patch(SearchBar.prototype, {
+ /**
+ * @override
+ */
+ getFieldsNames() {
+ return [...super.getFieldsNames(), "price", "list_price", "breadcrumb"];
+ },
+})
diff --git a/addons/website_sale/static/src/website_builder/products_searchbar_option_plugin.js b/addons/website_sale/static/src/website_builder/products_searchbar_option_plugin.js
index 713f8a3af7320..aa839b0d7d952 100644
--- a/addons/website_sale/static/src/website_builder/products_searchbar_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/products_searchbar_option_plugin.js
@@ -1,6 +1,5 @@
import { products_sort_mapping } from "@website_sale/website_builder/shared";
import { Plugin } from "@html_editor/plugin";
-import { _t } from "@web/core/l10n/translation";
import { registry } from "@web/core/registry";
class ProductsSearchbarOptionPlugin extends Plugin {
@@ -16,28 +15,6 @@ class ProductsSearchbarOptionPlugin extends Plugin {
orderBy: query_and_label.query,
dependency: "search_products_opt",
})),
- searchbar_option_display_items: [
- {
- label: _t("Description"),
- dataAttribute: "displayDescription",
- dependency: "search_products_opt",
- },
- {
- label: _t("Category"),
- dataAttribute: "displayExtraLink",
- dependency: "search_products_opt",
- },
- {
- label: _t("Price"),
- dataAttribute: "displayDetail",
- dependency: "search_products_opt",
- },
- {
- label: _t("Image"),
- dataAttribute: "displayImage",
- dependency: "search_products_opt",
- },
- ],
};
}
diff --git a/addons/website_sale/templates/shop_page_templates.xml b/addons/website_sale/templates/shop_page_templates.xml
index e8847986202d3..bb25a90d72e62 100644
--- a/addons/website_sale/templates/shop_page_templates.xml
+++ b/addons/website_sale/templates/shop_page_templates.xml
@@ -3,13 +3,9 @@
-
@@ -384,7 +380,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_sale/tests/test_fuzzy.py b/addons/website_sale/tests/test_fuzzy.py
index e0ff93df6fe44..5ec4d6952b809 100644
--- a/addons/website_sale/tests/test_fuzzy.py
+++ b/addons/website_sale/tests/test_fuzzy.py
@@ -23,9 +23,8 @@ def test_variant_default_code(self):
self.cr.flush()
options = {
- 'displayDescription': True, 'displayDetail': True, 'display_currency': True,
- 'displayExtraDetail': True, 'displayExtraLink': True,
- 'displayImage': True, 'allowFuzzy': True
+ 'display_currency': True,
+ 'allowFuzzy': True
}
results_count, _, fuzzy_term = website._search_with_fuzzy('products_only', 'RED234', 5, 'name asc', options)
self.assertEqual(1, results_count, "Should have found red")
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index 46b129a1f770c..9974d3ba327f8 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -50,6 +50,7 @@
'views/website_slides_templates_profile.xml',
'views/website_slides_templates_utils.xml',
'views/website_pages_views.xml',
+ 'views/website_searchbar_templates.xml',
'views/slide_channel_add.xml',
'wizard/slide_channel_invite_views.xml',
'data/digest_data.xml',
@@ -94,6 +95,7 @@
'website_slides/static/src/xml/slide_course_prerequisite.xml',
'website_slides/static/src/xml/slide_quiz.xml',
'website_slides/static/src/js/public/**/*',
+ 'website_slides/static/snippets/**/*.xml',
],
'website.assets_editor': [
'website_slides/static/src/js/systray_items/*.js',
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index c76b3af9bbf19..d0b4c2f49ce8c 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -385,11 +385,6 @@ def _slides_channel_user_values(self, compute_channels_my=True):
def _get_slide_channel_search_options(self, my=None, slug_tags=None, slide_category=None, **post):
return {
- 'displayDescription': True,
- 'displayDetail': False,
- 'displayExtraDetail': False,
- 'displayExtraLink': False,
- 'displayImage': False,
'allowFuzzy': not post.get('noFuzzy'),
'my': my,
'tag': slug_tags or post.get('tag'),
diff --git a/addons/website_slides/models/slide_channel.py b/addons/website_slides/models/slide_channel.py
index 342171eadfbb1..3aa9fc65ac12f 100644
--- a/addons/website_slides/models/slide_channel.py
+++ b/addons/website_slides/models/slide_channel.py
@@ -1029,8 +1029,6 @@ def get_backend_menu_id(self):
@api.model
def _search_get_detail(self, website, order, options):
- with_description = options['displayDescription']
- with_date = options['displayDetail']
my = options.get('my')
search_tags = options.get('tag')
slide_category = options.get('slide_category')
@@ -1050,20 +1048,16 @@ def _search_get_detail(self, website, order, options):
domain.append([('tag_ids', 'in', tags_.ids)])
if slide_category and 'nbr_%s' % slide_category in self:
domain.append([('nbr_%s' % slide_category, '>', 0)])
- search_fields = ['name', 'tag_ids.name']
- fetch_fields = ['name', 'website_url', 'tag_ids']
+ search_fields = ['name', 'tag_ids.name', 'description_short']
+ fetch_fields = ['name', 'website_url', 'tag_ids', 'total_time', 'rating_avg_stars']
mapping = {
'name': {'name': 'name', 'type': 'text', 'match': True},
'website_url': {'name': 'website_url', 'type': 'text', 'truncate': False},
+ 'total_time': {'name': 'total_time', 'type': 'text'},
+ 'rating_avg_stars': {'name': 'rating_avg_stars', 'type': 'float', 'precision': 1},
+ 'image_url': {'name': 'image_url', 'type': 'html'},
'tags': {'name': 'tag_ids', 'type': 'tags', 'match': True},
}
- if with_description:
- search_fields.append('description_short')
- fetch_fields.append('description_short')
- mapping['description'] = {'name': 'description_short', 'type': 'text', 'html': True, 'match': True}
- if with_date:
- fetch_fields.append('slide_last_update')
- mapping['detail'] = {'name': 'slide_last_update', 'type': 'date'}
return {
'model': 'slide.channel',
'base_domain': domain,
@@ -1071,12 +1065,20 @@ def _search_get_detail(self, website, order, options):
'fetch_fields': fetch_fields,
'mapping': mapping,
'icon': 'fa-graduation-cap',
+ 'template_key': 'website_slides.search_items_slide_channels',
+ 'group_name': self.env._("Courses"),
+ 'sequence': 90,
}
def _search_render_results(self, fetch_fields, mapping, icon, limit):
results_data = super()._search_render_results(fetch_fields, mapping, icon, limit)
for channel, data in zip(self, results_data):
data['tag_ids'] = channel.tag_ids.read(['name'])
+ data['image_url'] = '/web/image/slide.channel/%s/image_128' % data['id']
+ if data['total_time']:
+ h = int(data['total_time'])
+ m = round((data['total_time'] - h) * 60)
+ data['total_time'] = f"{h:2d}:{m:02d} h"
return results_data
def _get_placeholder_filename(self, field):
diff --git a/addons/website_slides/models/slide_slide.py b/addons/website_slides/models/slide_slide.py
index e44c1ac60315f..94f1934eccf6d 100644
--- a/addons/website_slides/models/slide_slide.py
+++ b/addons/website_slides/models/slide_slide.py
@@ -1280,8 +1280,7 @@ def get_backend_menu_id(self):
@api.model
def _search_get_detail(self, website, order, options):
- with_description = options['displayDescription']
- search_fields = ['name', 'tag_ids.name']
+ search_fields = ['name', 'tag_ids.name', 'description']
fetch_fields = ['id', 'name', 'tag_ids']
mapping = {
'name': {'name': 'name', 'type': 'text', 'match': True},
@@ -1290,10 +1289,6 @@ def _search_get_detail(self, website, order, options):
'extra_link_url': {'name': 'course_url', 'type': 'text', 'truncate': False},
'tags': {'name': 'tag_ids', 'type': 'tags', 'match': True},
}
- if with_description:
- search_fields.append('description')
- fetch_fields.append('description')
- mapping['description'] = {'name': 'description', 'type': 'text', 'html': True, 'match': True}
return {
'model': 'slide.slide',
'base_domain': [website.website_domain()],
@@ -1302,6 +1297,9 @@ def _search_get_detail(self, website, order, options):
'mapping': mapping,
'icon': 'fa-shopping-cart',
'order': 'name desc, id desc' if 'name desc' in order else 'name asc, id desc',
+ 'template_key': 'website_slides.search_items_slide_slides',
+ 'group_name': self.env._("Course Slides"),
+ 'sequence': 80,
}
def _search_render_results(self, fetch_fields, mapping, icon, limit):
diff --git a/addons/website_slides/static/snippets/s_searchbar/000.xml b/addons/website_slides/static/snippets/s_searchbar/000.xml
new file mode 100644
index 0000000000000..72151c1288932
--- /dev/null
+++ b/addons/website_slides/static/snippets/s_searchbar/000.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_slides/static/src/website_builder/slides_searchbar_option_plugin.js b/addons/website_slides/static/src/website_builder/slides_searchbar_option_plugin.js
index ddad933698f1a..07ef7b94c5fa2 100644
--- a/addons/website_slides/static/src/website_builder/slides_searchbar_option_plugin.js
+++ b/addons/website_slides/static/src/website_builder/slides_searchbar_option_plugin.js
@@ -18,18 +18,6 @@ class SlidesSearchbarOptionPlugin extends Plugin {
dependency: "search_slides_opt",
},
],
- searchbar_option_display_items: [
- {
- label: _t("Description"),
- dataAttribute: "displayDescription",
- dependency: "search_slides_opt",
- },
- {
- label: _t("Publication Date"),
- dataAttribute: "displayDetail",
- dependency: "search_slides_opt",
- },
- ],
};
}
diff --git a/addons/website_slides/views/website_searchbar_templates.xml b/addons/website_slides/views/website_searchbar_templates.xml
new file mode 100644
index 0000000000000..71b8b4be7d085
--- /dev/null
+++ b/addons/website_slides/views/website_searchbar_templates.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+