Skip to content

Commit

Permalink
changes after review
Browse files Browse the repository at this point in the history
  • Loading branch information
dzonidoo committed Nov 16, 2023
1 parent 9971436 commit ff53e3e
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions client/actions/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -823,22 +823,15 @@ function _filter(filterType: PLANNING_VIEW, params: ICombinedEventOrPlanningSear
if (currentFilterId != undefined || filterType === PLANNING_VIEW.COMBINED) {
promise = planningApi.ui.list.changeFilterId(currentFilterId, params);
} else if (filterType === PLANNING_VIEW.EVENTS) {
const calendar = urlParams.getString('calendar') ||
lastParams?.calendars?.[0] ||
(lastParams?.noCalendarAssigned ?
EVENTS.FILTER.NO_CALENDAR_ASSIGNED :
EVENTS.FILTER.ALL_CALENDARS
);

const calender = $location.search().calendar ||
const calendar = $location.search().calendar ||
get(lastParams, 'calendars[0]', null) ||
(get(lastParams, 'noCalendarAssigned', false) ?
{qcode: EVENTS.FILTER.NO_CALENDAR_ASSIGNED} :
{qcode: EVENTS.FILTER.ALL_CALENDARS}
);

promise = planningApi.ui.list.changeCalendarId(
calender.qcode,
calendar.qcode,
params
);
} else if (filterType === PLANNING_VIEW.PLANNING) {
Expand Down

0 comments on commit ff53e3e

Please sign in to comment.