diff --git a/app/controllers/admin/event_news_controller.rb b/app/controllers/admin/event_news_controller.rb index 2c4af24..afcc399 100644 --- a/app/controllers/admin/event_news_controller.rb +++ b/app/controllers/admin/event_news_controller.rb @@ -94,7 +94,7 @@ class Admin::EventNewsController < OrbitAdminController def import_from_xml download_tmp_xml params["import_xml"] import_from_tmp_xml File.read(File.join(Rails.root, "tmp", "ann_cc_ntu.xml")) - redirect_to admin_event_news_path + redirect_to admin_event_news_index_path end def import @@ -103,7 +103,7 @@ class Admin::EventNewsController < OrbitAdminController def import_from_wp import_from_wordpress params["import_xml"].tempfile - redirect_to admin_event_news_path + redirect_to admin_event_news_index_path end def importanns @@ -118,9 +118,9 @@ class Admin::EventNewsController < OrbitAdminController next if v == "" || v.nil? import_this_event_news(row, categories, tags) end - redirect_to admin_event_news_path + redirect_to admin_event_news_index_path else - redirect_to admin_event_news_path(:error => "1") + redirect_to admin_event_news_index_path(:error => "1") end end @@ -253,7 +253,7 @@ class Admin::EventNewsController < OrbitAdminController send_rejection_email(event_news,I18n.locale) end event_news.save - redirect_to admin_event_news_path + redirect_to admin_event_news_index_path end def edit diff --git a/app/controllers/event_news_controller.rb b/app/controllers/event_news_controller.rb index 63584ea..ad34dc3 100644 --- a/app/controllers/event_news_controller.rb +++ b/app/controllers/event_news_controller.rb @@ -36,7 +36,7 @@ class EventNewsController < ApplicationController "subtitle" => a.subtitle, "statuses" => statuses, "category" => a.category.title, - "postdate" => a.postdate, + "postdate" => a.event_date, "author" => author, "is_top" => (a.is_top? ? 1 : 0), "link_to_show" => link_to_show+"\" title=\"#{title}\"",