Skip to content

Commit 9883d93

Browse files
committed
Always consider event row state when creating table event
1 parent f991774 commit 9883d93

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/howitz/endpoints.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def logout_handler():
8787
current_app.logger.info("Logged out successfully.")
8888

8989

90-
def get_current_events(extended_event_format=False):
90+
def get_current_events():
9191
try:
9292
current_app.event_manager.get_events()
9393
except RetryError as retryErr: # Intermittent error in Zino
@@ -122,11 +122,8 @@ def get_current_events(extended_event_format=False):
122122

123123
table_events = []
124124
for c in events_sorted.values():
125-
if extended_event_format:
126-
table_events.append(create_table_event(c, expanded=str(c.id) in session["expanded_events"],
127-
selected=str(c.id) in session["selected_events"]))
128-
else:
129-
table_events.append(create_table_event(c)["event"])
125+
table_events.append(create_table_event(c, expanded=str(c.id) in session["expanded_events"],
126+
selected=str(c.id) in session["selected_events"]))
130127

131128
current_app.logger.debug('TABLE EVENTS %s', table_events[0])
132129

@@ -513,7 +510,7 @@ def bulk_update_events_status():
513510
current_app.logger.debug("SELECTED EVENTS %s", session["selected_events"])
514511

515512
# Rerender whole events table
516-
poll_events_list = get_current_events(extended_event_format=True)
513+
poll_events_list = get_current_events()
517514
return render_template('/responses/bulk-update-events-status.html', poll_event_list=poll_events_list)
518515

519516

0 commit comments

Comments
 (0)