Merge pull request #661 from LearningLocker/issue/display-fallback

Adds fallback for displays and names.

Author: ryasmi

public/assets/js/reports/reports/editLayout.js

@@ -114,7 +114,27 @@ define([
     relations: {
       actors: typeaheadHelpers.view('actors', 'Actor', 'Start typing name e.g. Bob', typeaheadHelpers.displayActor),
       verbs: typeaheadHelpers.view('verbs', 'Verb', 'Start typing verb e.g. completed', function (item) {
-        var id = item.id
+        var id = item.id;
+        var value = null;
+
+        // Return a human-readable value if the browser defines languages.
+        if (navigator.languages instanceof Array) {
+          value = item.display && (navigator.languages.map(function (lang) {
+            return item.display[lang];
+          }).filter(function (value) {
+            return value != null;
+          })[0] || (item.display[Object.keys(item.display)[0]]));
+        }
+
+        // Display human-readable value if it exists
+        if (value != null) {
+          return value + ' (' + id + ')';
+        }
+
+        // Otherwise display just the identifier.
+        else {
+          return id
+        }
         return item.display['en-GB'] + ' (' + id + ')';
       }),
       activities: typeaheadHelpers.view('activities', 'Activity URL', 'www.example.com/quiz/1'),

public/assets/js/reports/reports/typeaheadHelpers.js

@@ -10,11 +10,11 @@ define([
 
       // Return a human-readable value if the browser defines languages.
       if (navigator.languages instanceof Array) {
-        value = navigator.languages.map(function (lang) {
-          return item.definition && item.definition.name && item.definition.name[lang];
+        value = item.definition && item.definition.name && (navigator.languages.map(function (lang) {
+          return item.definition.name[lang];
         }).filter(function (value) {
           return value != null;
-        })[0];
+        })[0] || (item.definition.name[Object.keys(item.definition.name)[0]]));
       }
 
       // Display human-readable value if it exists