From dcd53fc807c7b086e3e7fb8357f14ff749643fc0 Mon Sep 17 00:00:00 2001
From: "OHASHI, Norikazu" <katz@neko-mori.sakura.ne.jp>
Date: Tue, 20 Apr 2021 22:51:46 +0900
Subject: [PATCH] =?utf8?q?=E6=9B=B8=E7=B1=8D=E4=B8=80=E8=A6=A7=E3=82=92?=
 =?utf8?q?=E7=BD=B2=E5=90=8D=E3=81=A7=E3=82=BD=E3=83=BC=E3=83=88=E3=81=99?=
 =?utf8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 sinatra/app/controllers/web_gui.rb | 3 ++-
 sinatra/app/models/books_db.rb     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sinatra/app/controllers/web_gui.rb b/sinatra/app/controllers/web_gui.rb
index 15e7a14..1689bff 100644
--- a/sinatra/app/controllers/web_gui.rb
+++ b/sinatra/app/controllers/web_gui.rb
@@ -76,7 +76,8 @@ class WebGui < Sinatra::Base
       book_info = Hash.new
       params.each do |key, value|
         case key
-        when 'summary', 'book_rank', 'cover_base64', 'cover_file', 'mime_type' then
+        when 'summary', 'book_rank', 'cover_base64',
+             'cover_file', 'mime_type' then
           # 対象キーは書籍情報ではないので飛す
           next
         end
diff --git a/sinatra/app/models/books_db.rb b/sinatra/app/models/books_db.rb
index cae0e35..a42b176 100644
--- a/sinatra/app/models/books_db.rb
+++ b/sinatra/app/models/books_db.rb
@@ -631,6 +631,9 @@ class BookManager
       end
     end
 
+    # タイトルと巻数でソート
+    find_books = find_books.order(:title).order(:volume)
+
     # 表示対象を抽出
     narrow_books = find_books.limit(step).offset(start)
     return narrow_books, find_books.size
-- 
2.19.2