pull/2487/head
jmontoyaa 9 years ago
parent 5762c20dd1
commit 1cf188096f
  1. 14
      main/inc/lib/sessionmanager.lib.php
  2. 4
      main/work/work.lib.php

@ -947,17 +947,19 @@ class SessionManager
FROM $workTable w FROM $workTable w
LEFT JOIN $workTableAssignment a LEFT JOIN $workTableAssignment a
ON (a.publication_id = w.id AND a.c_id = w.c_id) ON (a.publication_id = w.id AND a.c_id = w.c_id)
WHERE w.c_id = %s WHERE
AND parent_id = 0 w.c_id = %s AND
AND active IN (1, 0)"; parent_id = 0 AND
active IN (1, 0)";
} else { } else {
$sql = "SELECT count(w.id) as count $sql = "SELECT count(w.id) as count
FROM $workTable w FROM $workTable w
LEFT JOIN $workTableAssignment a LEFT JOIN $workTableAssignment a
ON (a.publication_id = w.id AND a.c_id = w.c_id) ON (a.publication_id = w.id AND a.c_id = w.c_id)
WHERE w.c_id = %s WHERE
AND parent_id = 0 w.c_id = %s AND
AND active IN (1, 0)"; parent_id = 0 AND
active IN (1, 0)";
if (empty($sessionId)) { if (empty($sessionId)) {
$sql .= ' AND w.session_id = NULL '; $sql .= ' AND w.session_id = NULL ';

@ -1335,9 +1335,10 @@ function getWorkListStudent(
$groupInfo = GroupManager::get_group_properties($group_id); $groupInfo = GroupManager::get_group_properties($group_id);
$groupIid = $groupInfo['iid']; $groupIid = $groupInfo['iid'];
} }
$groupIid = (int) $groupIid;
// Get list from database // Get list from database
if (!empty($group_id)) { if (!empty($groupIid)) {
$group_query = " WHERE w.c_id = $course_id AND post_group_id = $groupIid"; $group_query = " WHERE w.c_id = $course_id AND post_group_id = $groupIid";
$subdirs_query = "AND parent_id = 0"; $subdirs_query = "AND parent_id = 0";
} else { } else {
@ -1468,6 +1469,7 @@ function getWorkListTeacher(
$groupInfo = GroupManager::get_group_properties($group_id); $groupInfo = GroupManager::get_group_properties($group_id);
$groupIid = $groupInfo['iid']; $groupIid = $groupInfo['iid'];
} }
$groupIid = (int) $groupIid;
$is_allowed_to_edit = api_is_allowed_to_edit() || api_is_coach(); $is_allowed_to_edit = api_is_allowed_to_edit() || api_is_coach();
if (!in_array($direction, array('asc', 'desc'))) { if (!in_array($direction, array('asc', 'desc'))) {

Loading…
Cancel
Save