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