Merge pull request #792 from davidbgk/790-restore-placeholders

 Restore placeholders in search suggestions, fix #790

CHANGELOG.md

@@ -17,6 +17,7 @@
 
 - Fix JavaScript locales handling [#786](https://github.com/opendatateam/udata/pull/786)
 - Optimize images sizes for territory placeholders [#788](https://github.com/opendatateam/udata/issues/788)
+- Restore placeholders in search suggestions, fix [#790](https://github.com/opendatateam/udata/issues/790)
 - Fix share popover in production build [#793](https://github.com/opendatateam/udata/pull/793)
 
 ## 1.0.2 (2017-02-20)

js/components/site-search.vue

@@ -47,6 +47,7 @@
 
 <script>
 import { Cache } from 'cache';
+import placeholders from 'helpers/placeholders';
 
 function group(id, name, template) {
     return {id, name,
@@ -79,6 +80,7 @@ export default {
                 group('territory', this._('Territories'), 'territory'),
             ],
             minLength: 2,
+            placeholders: placeholders,
         }
     },
     computed: {
@@ -94,14 +96,14 @@ export default {
     },
     partials: {
         default: `<div class="logo">
-            <img :src="item.image_url" class="avatar" width="30" height="30" alt="">
+            <img :src="item.image_url || placeholders.generic" class="avatar" width="30" height="30" alt="">
             </div>
             <p v-html="item.title | highlight query"></p>`,
-        organization: `<div class="logo"><img :src="item.image_url" class="avatar" width="30" height="30" alt=""></div>
+        organization: `<div class="logo"><img :src="item.image_url || placeholders.organization" class="avatar" width="30" height="30" alt=""></div>
             <p v-html="item.name | highlight query"></p>
             <small v-if="item.acronym" v-html="item.acronym | highlight query"></small>`,
         territory: `<div class="logo">
-            <img :src="item.image_url" class="avatar" width="30" height="30" alt="">
+            <img :src="item.image_url || placeholders.territory" class="avatar" width="30" height="30" alt="">
             </div>
             <p v-html="item.title | highlight query"></p>
             <small v-if="item.parent">{{ item.parent }}</small>`,

js/helpers/placeholders.js

@@ -22,6 +22,11 @@ export const user = getFor('user');
  */
 export const reuse = getFor('reuse');
 
+/**
+ * Territory placeholder
+ */
+export const territory = `${config.theme_static}img/placeholder_territory_medium.png`;
+
 /**
  * Generic placeholder
  */
@@ -33,5 +38,6 @@ export default {
     user,
     organization,
     reuse,
+    territory,
     generic,
 };