Merge branch '27622-cycle-analytics-loading' into 'master'

Fix Cycle Analytics -> Plan is loading forever Closes #27622 See merge request !9577

Merge branch '27622-cycle-analytics-loading' into 'master'
05c8ec6c · Alfredo Sumaran · 261f5a68 · 27fab2ef · 05c8ec6c
Commit 05c8ec6c authored Feb 28, 2017 by Alfredo Sumaran
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

cycle_analytics_store.js.es6 .../javascripts/cycle_analytics/cycle_analytics_store.js.es6 +5 -2

No files found.
--- a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
+++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
@@ -75,8 +75,11 @@ const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
        const eventItem = Object.assign({}, DEFAULT_EVENT_OBJECTS[stage.slug], item);

        eventItem.totalTime = eventItem.total_time;
-        eventItem.author.webUrl = eventItem.author.web_url;
-        eventItem.author.avatarUrl = eventItem.author.avatar_url;
+
+        if (eventItem.author) {
+          eventItem.author.webUrl = eventItem.author.web_url;
+          eventItem.author.avatarUrl = eventItem.author.avatar_url;
+        }

        if (eventItem.created_at) eventItem.createdAt = eventItem.created_at;
        if (eventItem.short_sha) eventItem.shortSha = eventItem.short_sha;