Ignore deleted files see BT#14459

pull/2573/head
Julio 8 years ago
parent c37409f4e8
commit 44d167cce7
  1. 8
      main/inc/lib/document.lib.php
  2. 2
      main/lp/learnpath.class.php
  3. 4
      main/lp/lp_edit_item.php

@ -1299,6 +1299,7 @@ class DocumentManager
* @param bool $load_parents load folder parents * @param bool $load_parents load folder parents
* @param int $session_id The session ID, * @param int $session_id The session ID,
* 0 if requires context *out of* session, and null to use global context * 0 if requires context *out of* session, and null to use global context
* @param bool $ignoreDeleted
* *
* @return array document content * @return array document content
*/ */
@ -1306,7 +1307,8 @@ class DocumentManager
$id, $id,
$course_code, $course_code,
$load_parents = false, $load_parents = false,
$session_id = null $session_id = null,
$ignoreDeleted = false
) { ) {
$course_info = api_get_course_info($course_code); $course_info = api_get_course_info($course_code);
$course_id = $course_info['real_id']; $course_id = $course_info['real_id'];
@ -1324,6 +1326,10 @@ class DocumentManager
$sql = "SELECT * FROM $TABLE_DOCUMENT $sql = "SELECT * FROM $TABLE_DOCUMENT
WHERE c_id = $course_id $sessionCondition AND id = $id"; WHERE c_id = $course_id $sessionCondition AND id = $id";
if ($ignoreDeleted) {
$sql .= " AND path NOT LIKE = '%_DELETED_%' ";
}
$result = Database::query($sql); $result = Database::query($sql);
if ($result && Database::num_rows($result) == 1) { if ($result && Database::num_rows($result) == 1) {
$row = Database::fetch_array($result, 'ASSOC'); $row = Database::fetch_array($result, 'ASSOC');

@ -7179,7 +7179,7 @@ class learnpath
if (isset($_POST['path']) && !empty($_POST['path'])) { if (isset($_POST['path']) && !empty($_POST['path'])) {
$document_id = (int) $_POST['path']; $document_id = (int) $_POST['path'];
$documentInfo = DocumentManager::get_document_data_by_id($document_id, api_get_course_id()); $documentInfo = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), false, null, true);
if (empty($documentInfo)) { if (empty($documentInfo)) {
// Try with iid // Try with iid
$table = Database::get_course_table(TABLE_DOCUMENT); $table = Database::get_course_table(TABLE_DOCUMENT);

@ -129,12 +129,12 @@ echo $learnPath->build_action_menu();
echo '<div class="row">'; echo '<div class="row">';
echo '<div id="lp_sidebar" class="col-md-4">'; echo '<div id="lp_sidebar" class="col-md-4">';
$documentId = isset($_GET['path_item']) ? (int) $_GET['path_item'] : 0; $documentId = isset($_GET['path_item']) ? (int) $_GET['path_item'] : 0;
$documentInfo = DocumentManager::get_document_data_by_id($documentId, api_get_course_id()); $documentInfo = DocumentManager::get_document_data_by_id($documentId, api_get_course_id(), false, null, true);
if (empty($documentInfo)) { if (empty($documentInfo)) {
// Try with iid // Try with iid
$table = Database::get_course_table(TABLE_DOCUMENT); $table = Database::get_course_table(TABLE_DOCUMENT);
$sql = "SELECT path FROM $table $sql = "SELECT path FROM $table
WHERE c_id = $course_id AND iid = $documentId"; WHERE c_id = $course_id AND iid = $documentId AND path NOT LIKE '%_DELETED_%'";
$res_doc = Database::query($sql); $res_doc = Database::query($sql);
$path_file = Database::result($res_doc, 0, 0); $path_file = Database::result($res_doc, 0, 0);
} else { } else {

Loading…
Cancel
Save