save

petrjasek · Jun 18, 2024 · 4708ba6 · 4708ba6
1 parent 204ae38
commit 4708ba6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/client/components/Events/EventItem.tsx b/client/components/Events/EventItem.tsx
@@ -167,7 +167,6 @@ class EventItemComponent extends React.Component<IProps, IState> {
 
         const hasPlanning = eventUtils.eventHasPlanning(item);
         const isItemLocked = lockUtils.isItemLocked(item, lockedItems);
-        const showRelatedPlanningLink = activeFilter === PLANNING_VIEW.COMBINED && hasPlanning;
         let borderState: 'locked' | 'active' | false = false;
 
         if (isItemLocked) {
@@ -258,7 +257,7 @@ class EventItemComponent extends React.Component<IProps, IState> {
                         {secondaryFields.includes('files') && renderFields('files', item)}
 
 
-                        {(showRelatedPlanningLink) && (
+                        {(hasPlanning) && (
                             <span
                                 className="sd-overflow-ellipsis sd-list-item__element-lm-10"
                             >
@@ -297,4 +296,4 @@ class EventItemComponent extends React.Component<IProps, IState> {
     }
 }
 
-export const EventItem = connect()(EventItemComponent);
+export const EventItem = connect()(EventItemComponent);
diff --git a/client/components/Events/EventItemWithPlanning.tsx b/client/components/Events/EventItemWithPlanning.tsx
@@ -240,7 +240,6 @@ export class EventItemWithPlanning extends React.Component<IProps, IState> {
                 expanded={this.state.openPlanningItems}
                 nestedChildren={getPlannings(eventProps.item)}
                 noMarginTop={this.props.listViewType === LIST_VIEW_TYPE.LIST}
-                refNode={this.props.refNode}
             />
         );
     }

diff --git a/client/components/Main/ListGroupItem.tsx b/client/components/Main/ListGroupItem.tsx
@@ -10,7 +10,7 @@ import {
 import {EventItem, EventItemWithPlanning} from '../Events';
 import {PlanningItem} from '../Planning';
 
-import {ITEM_TYPE, EVENTS, PLANNING, MAIN, CLICK_DELAY} from '../../constants';
+import {ITEM_TYPE, EVENTS, PLANNING, CLICK_DELAY} from '../../constants';
 import {getItemType, eventUtils} from '../../utils';
 import {planningApi} from '../../superdeskApi';
 
@@ -244,7 +244,7 @@ export class ListGroupItem extends React.Component<IProps, IState> {
 
         switch (itemType) {
         case ITEM_TYPE.EVENT:
-            if (eventUtils.eventHasPlanning(item) && activeFilter === MAIN.FILTERS.COMBINED) {
+            if (eventUtils.eventHasPlanning(item)) {
                 return (
                     <EventItemWithPlanning
                         eventProps={eventProps}

diff --git a/server/planning/search/eventsplanning_search.py b/server/planning/search/eventsplanning_search.py
@@ -66,7 +66,8 @@ def get(self, req, lookup):
         query = self._construct_search_query(repo, params, search_filter)
 
         if repo == "events" or repo == "event":
-            return self._search_events(req, params, query, search_filter)
+            items = self._search_events(req, params, query, search_filter)
+            return self._get_combined_view_data(items, req, params, search_filter)
         elif repo == "planning":
             return self._search_planning(req, params, query, search_filter)
         else: