beenull/XBackBone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Working tag search with all modes, tag delete.

Browse source 
closes #121
This commit is contained in:
Sergio Brighenti 2020-03-30 14:53:27 +02:00
parent 6a58bc4a32
commit 008ae77718
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/Database/Queries/MediaQuery.php
View file

@ -5,9 +5,7 @@ namespace App\Database\Queries;
use App\Database\DB;
use League\Flysystem\FileNotFoundException;
use League\Flysystem\Filesystem;
use League\Flysystem\Plugin\ListFiles;
use League\Flysystem\Plugin\ListWith;
use PDO;
class MediaQuery
{
@ -186,13 +184,11 @@ class MediaQuery
if ($this->isAdmin) {
$files = $this->storage->listWith(['size', 'mimetype'], '/', true);
$this->pages = count($files) / self::PER_PAGE_ADMIN;
$offset = $page * self::PER_PAGE_ADMIN;
$limit = self::PER_PAGE_ADMIN;
} else {
$userCode = $this->db->query('SELECT `user_code` FROM `users` WHERE `id` = ?', $this->userId)->fetch()->user_code;
$files = $this->storage->listWith(['size', 'mimetype'], $userCode);
$this->pages = count($files) / self::PER_PAGE;
$offset = $page * self::PER_PAGE;
$limit = self::PER_PAGE;
}
@ -215,9 +211,15 @@ class MediaQuery
$params[] = '%'.htmlentities($this->text).'%';
$paths = array_column($files, 'path');
} else {
$files = array_slice($files, $offset, $limit);
$paths = array_column($files, 'path');
$queryMedia = 'SELECT `uploads`.*, `users`.`user_code`, `users`.`username` FROM `uploads` LEFT JOIN `users` ON `uploads`.`user_id` = `users`.`id` WHERE `uploads`.`storage_path` IN ("'.implode('","', $paths).'")';
if ($this->tagId !== null) {
$paths = array_column($files, 'path');
$ids = $this->getMediaIdsByTagId($this->tagId);
$queryMedia = 'SELECT `uploads`.*, `users`.`user_code`, `users`.`username` FROM `uploads` LEFT JOIN `users` ON `uploads`.`user_id` = `users`.`id` WHERE `uploads`.`storage_path` IN ("'.implode('","', $paths).'") AND `uploads`.`id` IN ('.implode(',', $ids).')';
} else {
$files = array_slice($files, $offset, $limit, true);
$paths = array_column($files, 'path');
$queryMedia = 'SELECT `uploads`.*, `users`.`user_code`, `users`.`username` FROM `uploads` LEFT JOIN `users` ON `uploads`.`user_id` = `users`.`id` WHERE `uploads`.`storage_path` IN ("'.implode('","', $paths).'")';
}
}
$medias = $this->db->query($queryMedia, $params)->fetchAll();
@ -245,9 +247,12 @@ class MediaQuery
}
}
if ($this->text !== null) {
$this->media = array_slice($this->media, $offset, $limit);
$this->pages = count($this->media) / $limit;
if ($this->text !== null || $this->tagId !== null) {
$this->media = array_slice($this->media, $offset, $limit, true);
}
return $this;
}

7
src/js/app.js
View file

@ -183,7 +183,7 @@ var app = {
}
$.ajax({
type: 'POST',
url: window.AppConfig.base_url + '/tag/add',
url: window.AppConfig.base_url + '/tag/add' + window.location.search,
data: {'tag': tag, 'mediaId': mediaId},
dataType: 'json',
success: function (data) {
@ -208,7 +208,10 @@ var app = {
e.stopPropagation();
var $tag = $(this);
$.post(window.AppConfig.base_url + '/tag/remove', {'tagId': $tag.data('id'), 'mediaId': $tag.data('media')}, function (){
$.post(window.AppConfig.base_url + '/tag/remove', {
'tagId': $tag.data('id'),
'mediaId': $tag.data('media')
}, function () {
$tag.remove();
});
}