From 90f08c96fce7c70ea6b1f922c62a8dede18fe208 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 20 Mar 2013 02:11:29 +0800 Subject: [PATCH] Fix merge error: add missing delete route --- vendor/built_in_modules/archive/config/routes.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vendor/built_in_modules/archive/config/routes.rb b/vendor/built_in_modules/archive/config/routes.rb index 9bb56fffb..45a1b1a54 100644 --- a/vendor/built_in_modules/archive/config/routes.rb +++ b/vendor/built_in_modules/archive/config/routes.rb @@ -2,7 +2,11 @@ Rails.application.routes.draw do namespace :panel do namespace :archive do namespace :back_end do - resources :archive_files + resources :archive_files do + collection do + get 'delete' + end + end resources :archive_file_categorys resources :tags end @@ -16,4 +20,4 @@ Rails.application.routes.draw do end end match "/appfront/*path" => redirect("/panel/*path") -end +end \ No newline at end of file