From 1ead46323fb83973dd7957a86bc826d30061c50f Mon Sep 17 00:00:00 2001 From: Harry Kiselev Date: Thu, 13 Dec 2018 13:27:20 +0000 Subject: Fix calendar events fetching error on private profile page. --- app/assets/javascripts/pages/users/user_tabs.js | 2 ++ changelogs/unreleased/fix-calendar-events-fetching-error.yml | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 changelogs/unreleased/fix-calendar-events-fetching-error.yml diff --git a/app/assets/javascripts/pages/users/user_tabs.js b/app/assets/javascripts/pages/users/user_tabs.js index 006eaa08cd1..1c3fd58ca74 100644 --- a/app/assets/javascripts/pages/users/user_tabs.js +++ b/app/assets/javascripts/pages/users/user_tabs.js @@ -208,6 +208,8 @@ export default class UserTabs { loadActivityCalendar() { const $calendarWrap = this.$parentEl.find('.tab-pane.active .user-calendar'); + if (!$calendarWrap.length) return; + const calendarPath = $calendarWrap.data('calendarPath'); AjaxCache.retrieve(calendarPath) diff --git a/changelogs/unreleased/fix-calendar-events-fetching-error.yml b/changelogs/unreleased/fix-calendar-events-fetching-error.yml new file mode 100644 index 00000000000..ad4a40cd9a0 --- /dev/null +++ b/changelogs/unreleased/fix-calendar-events-fetching-error.yml @@ -0,0 +1,5 @@ +--- +title: Fix calendar events fetching error on private profile page +merge_request: 23718 +author: Harry Kiselev +type: other -- cgit v1.2.1