github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-01 13:53:09 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Added book selector to books sort

Browse Source 
Now more efficient rather than listing all books in the system.
This commit is contained in:
Dan Brown
2019-04-06 16:56:50 +01:00
parent 17969c0bbf
commit aedff7dc6d
5 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
resources/views/books/sort.blade.php
View File

@ -1,7 +1,5 @@
@extends('simple-layout')
{{--TODO - Load books in via selector interface--}}
@section('body')
<div class="container">
@ -19,7 +17,7 @@
<div class="grid left-focus gap-xl">
<div>
<div class="card content-wrap">
<h1 class="list-heading">{{ trans('entities.books_sort') }}</h1>
<h1 class="list-heading mb-l">{{ trans('entities.books_sort') }}</h1>
<div id="sort-boxes">
@include('books.sort-box', ['book' => $book, 'bookChildren' => $bookChildren])
</div>
@ -37,20 +35,12 @@
</div>
<div>
@if(count($books) > 1)
<div class="card content-wrap">
<h2 class="list-heading">{{ trans('entities.books_sort_show_other') }}</h2>
<div id="additional-books">
@foreach($books as $otherBook)
@if($otherBook->id !== $book->id)
<div>
<a href="{{ $otherBook->getUrl('/sort-item') }}" class="text-book">@icon('book'){{ $otherBook->name }}</a>
</div>
@endif
@endforeach
</div>
</div>
@endif
<div class="card content-wrap">
<h2 class="list-heading mb-m">{{ trans('entities.books_sort_show_other') }}</h2>
@include('components.entity-selector', ['name' => 'books_list', 'selectorSize' => 'compact', 'entityTypes' => 'book', 'entityPermission' => 'update', 'showAdd' => true])
</div>
</div>
</div>
@ -84,18 +74,17 @@
// Create our sortable group
let group = $('.sort-list').sortable(sortableOptions);
// Add additional books into the view on select.
$('#additional-books').on('click', 'a', function(e) {
e.preventDefault();
// Add book on selection confirm
window.$events.listen('entity-select-confirm', function(entityInfo) {
const alreadyAdded = $container.find(`[data-type="book"][data-id="${entityInfo.id}"]`).length > 0;
if (alreadyAdded) return;
const $link = $(this);
const url = $link.attr('href');
$.get(url, function(data) {
$container.append(data);
const entitySortItemUrl = entityInfo.link + '/sort-item';
window.$http.get(entitySortItemUrl).then(resp => {
$container.append(resp.data);
group.sortable("destroy");
group = $('.sort-list').sortable(sortableOptions);
});
$link.remove();
});
/**
@ -185,7 +174,7 @@
let lastSort = '';
let reverse = false;
const reversableTypes = ['name', 'created', 'updated'];
const reversibleTypes = ['name', 'created', 'updated'];
$container.on('click', '.sort-box-options [data-sort]', function(event) {
event.preventDefault();
@ -194,7 +183,7 @@
reverse = (lastSort === sort) ? !reverse : false;
let sortFunction = sortOperations[sort];
if (reverse && reversableTypes.includes(sort)) {
if (reverse && reversibleTypes.includes(sort)) {
sortFunction = function(a, b) {
return 0 - sortOperations[sort](a, b)
};

6
resources/views/components/entity-selector.blade.php
View File

@ -4,5 +4,11 @@
<input type="text" placeholder="{{ trans('common.search') }}" entity-selector-search>
<div class="text-center loading" entity-selector-loading>@include('partials.loading-icon')</div>
<div entity-selector-results></div>
@if($showAdd)
<div class="entity-selector-add">
<button entity-selector-add-button type="button"
class="button outline">@icon('add'){{ trans('common.add') }}</button>
</div>
@endif
</div>
</div>