diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 6 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index ab9e7eb6f..025b05a56 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -1294,12 +1294,18 @@ var render_gallery = function(data_table, table_name, nb_select, gallery_id){ var thumb = ""; if ("main_image__thumbnail" in data){ thumb = data["main_image__thumbnail"]; + } else if ("thumbnail" in data){ + thumb = data["thumbnail"]; + if (!thumb.startsWith("media/") && !thumb.startsWith("/media/")) thumb = "/media/" + thumb; } else { thumb = static_path + "media/images/empty-image.png"; } var image = ""; if ("main_image__image" in data){ image = data["main_image__image"]; + } else if ("image" in data){ + image = data["image"]; + if (!image.startsWith("media/") && !image.startsWith("/media/")) image = "/media/" + image; } else { image = static_path + "media/images/empty-image.png"; } diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 9249318af..ed2fb07ea 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -2337,10 +2337,13 @@ def get_item( query_table_cols.append("cached_label") table_cols.append("cached_label") if data_type == "json-image": - query_table_cols.append("main_image__thumbnail") - table_cols.append("main_image__thumbnail") - query_table_cols.append("main_image__image") - table_cols.append("main_image__image") + prefix = "" + if model != models.Document: + prefix = "main_image__" + query_table_cols.append(prefix + "thumbnail") + table_cols.append(prefix + "thumbnail") + query_table_cols.append(prefix + "image") + table_cols.append(prefix + "image") elif data_type == "json-map": base_query_key = "main_geodata__" if model.SLUG == "find": |