From 2e195defad86b35ed2a6ebad0b5680ca0fd5f157 Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 30 Oct 2019 22:24:10 +0800 Subject: [PATCH] Update journal_papers_controller.rb --- app/controllers/admin/journal_papers_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/journal_papers_controller.rb b/app/controllers/admin/journal_papers_controller.rb index ab78194..a116c94 100644 --- a/app/controllers/admin/journal_papers_controller.rb +++ b/app/controllers/admin/journal_papers_controller.rb @@ -9,7 +9,8 @@ class Admin::JournalPapersController < OrbitMemberController before_action :need_access_right before_action :allow_admin_only, :only => [:index, :setting] - + def merge + end def index @writing_journals = JournalPaper.order_by(:year=>'desc').page(params[:page]).per(10) end