akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/10945-search-results-page

Browse Source
This commit is contained in:
Alex
2025-03-19 12:25:14 +01:00
committed by GitHub
parent 67311c2c9a ff9545d03c
commit 076059cd3c
194 changed files with 7025 additions and 2723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/public/api/v1/models/_category.json.jbuilder
-20
View File
@@ -4,26 +4,6 @@ json.locale category.locale
json.description category.description
json.position category.position
json.related_categories do
if category.related_categories.any?
json.array! category.related_categories.each do |related_category|
json.partial! partial: 'public/api/v1/models/associated_category', formats: [:json], category: related_category
end
end
end
if category.parent_category.present?
json.parent_category do
json.partial! partial: 'public/api/v1/models/associated_category', formats: [:json], category: category.parent_category
end
end
if category.root_category.present?
json.root_category do
json.partial! partial: 'public/api/v1/models/associated_category', formats: [:json], category: category.root_category
end
end
json.meta do
json.articles_count category.articles.published.size
end
app/views/public/api/v1/portals/articles/index.json.jbuilder
+1 -1
View File
@@ -4,5 +4,5 @@ json.payload do
end
json.meta do
json.articles_count @articles.published.size
json.articles_count @articles_count
end
app/views/widget_tests/index.html.erb
+2 -1
View File
@@ -1,5 +1,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
<body>
</body>
<%
user_id = 1