M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-03-15 23:04:22 +03:00
parent e2c04fab5d
commit c080a63ed1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/pages/ProductStockByAttributes.vue
View File

@@ -589,8 +589,6 @@ function resolveProductImageUrl(item) {
async function resolveProductImageUrlForCarousel(item) { async function resolveProductImageUrlForCarousel(item) {
const resolved = resolveProductImageUrl(item) const resolved = resolveProductImageUrl(item)
const fullUrl = String(resolved.fullUrl || '').trim()
if (fullUrl) return fullUrl
const contentUrl = String(resolved.contentUrl || '').trim() const contentUrl = String(resolved.contentUrl || '').trim()
if (contentUrl) { if (contentUrl) {
try { try {
@@ -605,6 +603,8 @@ async function resolveProductImageUrlForCarousel(item) {
// fall through to public url // fall through to public url
} }
} }
const fullUrl = String(resolved.fullUrl || '').trim()
if (fullUrl) return fullUrl
const publicUrl = String(resolved.publicUrl || '').trim() const publicUrl = String(resolved.publicUrl || '').trim()
return String(publicUrl || fullUrl || contentUrl || '').trim() return String(publicUrl || fullUrl || contentUrl || '').trim()
} }

4
ui/src/pages/ProductStockQuery.vue
View File

@@ -576,8 +576,6 @@ function resolveProductImageUrl(item) {
async function resolveProductImageUrlForCarousel(item) { async function resolveProductImageUrlForCarousel(item) {
const resolved = resolveProductImageUrl(item) const resolved = resolveProductImageUrl(item)
const fullUrl = String(resolved.fullUrl || '').trim()
if (fullUrl) return fullUrl
const contentUrl = String(resolved.contentUrl || '').trim() const contentUrl = String(resolved.contentUrl || '').trim()
if (contentUrl) { if (contentUrl) {
try { try {
@@ -592,6 +590,8 @@ async function resolveProductImageUrlForCarousel(item) {
// fall through to public url // fall through to public url
} }
} }
const fullUrl = String(resolved.fullUrl || '').trim()
if (fullUrl) return fullUrl
const publicUrl = String(resolved.publicUrl || '').trim() const publicUrl = String(resolved.publicUrl || '').trim()
return String(publicUrl || fullUrl || contentUrl || '').trim() return String(publicUrl || fullUrl || contentUrl || '').trim()
} }