From 82e869ffa990f8c2f30e078760592a75a0de1cc1 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 24 Jan 2020 09:53:40 +0100 Subject: [PATCH] Add status filter BT#16344 --- main/inc/ajax/model.ajax.php | 5 +++++ main/session/session_list.php | 4 +--- main/session/session_list_simple.php | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php index c8f2acd8da..af2f0a971d 100755 --- a/main/inc/ajax/model.ajax.php +++ b/main/inc/ajax/model.ajax.php @@ -701,6 +701,11 @@ switch ($action) { $extraFieldsToLoad[] = $fieldData; } } + + if ($list_type === 'custom') { + $whereCondition .= ' AND (s.status IN ("'.SessionManager::STATUS_PLANNED.'", "'.SessionManager::STATUS_PROGRESS.'") ) '; + } + if ($list_type === 'simple' || $list_type === 'custom') { $count = SessionManager::get_sessions_admin( ['where' => $whereCondition, 'extra' => $extra_fields], diff --git a/main/session/session_list.php b/main/session/session_list.php index 80033313da..f1f88dd3b3 100644 --- a/main/session/session_list.php +++ b/main/session/session_list.php @@ -52,11 +52,9 @@ $actions = ' $(function() { $("#course_name").on("change", function() { var courseId = $(this).val(); - if (!courseId) { - return; + return; } - window.location = "'.$url.'?course_id="+courseId; }); }); diff --git a/main/session/session_list_simple.php b/main/session/session_list_simple.php index b2391a613a..7a0358deda 100644 --- a/main/session/session_list_simple.php +++ b/main/session/session_list_simple.php @@ -17,7 +17,7 @@ $htmlHeadXtra[] = api_get_jqgrid_js(); $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null; $idChecked = isset($_REQUEST['idChecked']) ? $_REQUEST['idChecked'] : null; -$list_type = isset($_REQUEST['list_type']) ? $_REQUEST['list_type'] : 'custom'; +$list_type = isset($_REQUEST['list_type']) ? $_REQUEST['list_type'] : 'simple'; $tool_name = get_lang('SessionList'); Display::display_header($tool_name);