From 55234b4e271814827c8084a84814ffec0f0f4a43 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Sat, 9 Sep 2023 17:01:48 +0200 Subject: [PATCH 1/2] continue development after release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 88f18119..5003783a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.8.0 +4.8.99 From 6abf998b563bfdc8f8fa63db01e8bb78b13fc291 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Mon, 2 Oct 2023 22:48:24 +0200 Subject: [PATCH 2/2] fix: documents sort sql needs Arel.sql --- plugins/documents/app/controllers/documents_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/documents/app/controllers/documents_controller.rb b/plugins/documents/app/controllers/documents_controller.rb index 7290ef3c..8950f347 100644 --- a/plugins/documents/app/controllers/documents_controller.rb +++ b/plugins/documents/app/controllers/documents_controller.rb @@ -14,7 +14,7 @@ class DocumentsController < ApplicationController else 'data IS NULL DESC, name' end - + sort = Arel.sql(sort) # this is okay as we don't use user params directly @documents = Document.where(parent: @document).page(params[:page]).per(@per_page).order(sort) end