Update journal_papers_controller.rb

2019-10-30 22:24:10 +08:00 · 2019-10-30 22:24:10 +08:00 · 2e195defad
parent 7f1ec59a92
commit 2e195defad
1 changed files with 2 additions and 1 deletions
--- 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