AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #957 from ssteeltm/docs-files-search-recursive 

search in all folders when in root (docs/files)
This commit is contained in:
Johnny 2024-05-14 21:20:59 -04:00 committed by GitHub
parent bd12319422 1242bd31c9
commit b8a4f0f10f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
client_documents.php
View File

@ -33,17 +33,31 @@ if (!empty($_GET['folder_id'])) {
// Set Folder Location Var used when creating folders // Set Folder Location Var used when creating folders
$folder_location = 0; $folder_location = 0;
$sql = mysqli_query( if ($get_folder_id == 0 && $_GET["q"]) {
$mysqli, $sql = mysqli_query(
"SELECT SQL_CALC_FOUND_ROWS * FROM documents $mysqli,
LEFT JOIN users ON document_created_by = user_id "SELECT SQL_CALC_FOUND_ROWS * FROM documents
WHERE document_client_id = $client_id LEFT JOIN users ON document_created_by = user_id
AND document_template = 0 WHERE document_client_id = $client_id
AND document_folder_id = $folder AND document_template = 0
AND document_archived_at IS NULL
$query_snippet AND document_archived_at IS NULL
ORDER BY $sort $order LIMIT $record_from, $record_to" $query_snippet
); ORDER BY $sort $order LIMIT $record_from, $record_to"
);
}else{
$sql = mysqli_query(
$mysqli,
"SELECT SQL_CALC_FOUND_ROWS * FROM documents
LEFT JOIN users ON document_created_by = user_id
WHERE document_client_id = $client_id
AND document_template = 0
AND document_folder_id = $folder
AND document_archived_at IS NULL
$query_snippet
ORDER BY $sort $order LIMIT $record_from, $record_to"
);
}
$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

33
client_files.php
View File

@ -39,16 +39,29 @@ if ($view == 1) {
// Set Folder Location Var used when creating folders // Set Folder Location Var used when creating folders
$folder_location = 1; $folder_location = 1;
$sql = mysqli_query( if ($get_folder_id == 0 && $_GET["q"]) {
$mysqli, $sql = mysqli_query(
"SELECT SQL_CALC_FOUND_ROWS * FROM files $mysqli,
WHERE file_client_id = $client_id "SELECT SQL_CALC_FOUND_ROWS * FROM files
AND file_folder_id = $folder_id WHERE file_client_id = $client_id
AND file_archived_at IS NULL
AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%') AND file_archived_at IS NULL
$query_images AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%')
ORDER BY $sort $order LIMIT $record_from, $record_to" $query_images
); ORDER BY $sort $order LIMIT $record_from, $record_to"
);
}else{
$sql = mysqli_query(
$mysqli,
"SELECT SQL_CALC_FOUND_ROWS * FROM files
WHERE file_client_id = $client_id
AND file_folder_id = $folder_id
AND file_archived_at IS NULL
AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%')
$query_images
ORDER BY $sort $order LIMIT $record_from, $record_to"
);
}
$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));