From ec57cbff1cbc44e4b1abbcee326f672d8d308f2e Mon Sep 17 00:00:00 2001 From: Spen Date: Tue, 2 Jul 2013 14:47:10 +0800 Subject: [PATCH] ntue mail cron & log filter fix --- app/controllers/admin/mail_cron_logs_controller.rb | 9 ++++++++- app/controllers/admin/mail_crons_controller.rb | 9 ++++++++- app/views/admin/mail_cron_logs/_sort_headers.html.erb | 4 ++-- app/views/admin/mail_cron_logs/index.js.erb | 1 + app/views/admin/mail_crons/_sort_headers.html.erb | 4 ++-- app/views/admin/mail_crons/index.html.erb | 7 +++---- app/views/admin/mail_crons/index.js.erb | 1 + 7 files changed, 25 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/mail_cron_logs_controller.rb b/app/controllers/admin/mail_cron_logs_controller.rb index b07c9d5cd..2edf2e890 100644 --- a/app/controllers/admin/mail_cron_logs_controller.rb +++ b/app/controllers/admin/mail_cron_logs_controller.rb @@ -6,7 +6,14 @@ class Admin::MailCronLogsController < OrbitBackendController def index - @mail_cron_logs = MailCronLog.all.desc(:created_at).page(params[:page_main] ).per('20') + # @mail_cron_logs = MailCronLog.all.desc(:created_at).page(params[:page_main] ).per('20') + @mail_cron_logs = (params[:sort]) ? get_sorted_and_filtered("mail_cron_log") : get_viewable("mail_cron_log") + + respond_to do |format| + format.html # index.html.erb + format.xml { render :xml => @mail_crons } + format.js + end end diff --git a/app/controllers/admin/mail_crons_controller.rb b/app/controllers/admin/mail_crons_controller.rb index b9c2575bf..fc5eb8c8e 100644 --- a/app/controllers/admin/mail_crons_controller.rb +++ b/app/controllers/admin/mail_crons_controller.rb @@ -6,7 +6,14 @@ class Admin::MailCronsController < OrbitBackendController def index - @mail_logs = MailCron.all.asc(:mail_sentdate).page(params[:page_main] ).per('20') + # @mail_crons = MailCron.all.asc(:mail_sentdate).page(params[:page_main] ).per('20') + @mail_crons = (params[:sort]) ? get_sorted_and_filtered("mail_cron") : get_viewable("mail_cron") + + respond_to do |format| + format.html # index.html.erb + format.xml { render :xml => @mail_crons } + format.js + end end diff --git a/app/views/admin/mail_cron_logs/_sort_headers.html.erb b/app/views/admin/mail_cron_logs/_sort_headers.html.erb index 1faf81142..e8a7d33ae 100644 --- a/app/views/admin/mail_cron_logs/_sort_headers.html.erb +++ b/app/views/admin/mail_cron_logs/_sort_headers.html.erb @@ -1,6 +1,6 @@ <%= render_sort_bar(true, delete_admin_mail_cron_logs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['subject', 'subject','span2', :subject] , + ['subject', 'mail_subject','span2', :subject] , ['mail_to', 'mail_to','span2', :mail_to] , ['mail_user', 'mail_user','span2', :mail_user] , ['mail_from_app', 'mail_from_app','span2', :mail_from_app] , - ['sentdate', 'sentdate','span2', :sentdate] ).html_safe %> \ No newline at end of file + ['sentdate', 'created_at','span2', :sentdate] ).html_safe %> \ No newline at end of file diff --git a/app/views/admin/mail_cron_logs/index.js.erb b/app/views/admin/mail_cron_logs/index.js.erb index 6605cc4a6..504d3ab2b 100644 --- a/app/views/admin/mail_cron_logs/index.js.erb +++ b/app/views/admin/mail_cron_logs/index.js.erb @@ -1,3 +1,4 @@ +$("#delete_all").attr("action", "<%= delete_admin_mail_cron_logs_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]) %>"); $("#sort_headers").html("<%= j render 'sort_headers' %>"); $("#tbody_mail_cron_logs").html("<%= j render :partial => 'mail_cron_log', :collection => @mail_cron_logs %>"); $("#mail_cron_log_pagination").html("<%= j paginate @mail_cron_logs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>"); \ No newline at end of file diff --git a/app/views/admin/mail_crons/_sort_headers.html.erb b/app/views/admin/mail_crons/_sort_headers.html.erb index 261623f7b..2d1e6ca2b 100644 --- a/app/views/admin/mail_crons/_sort_headers.html.erb +++ b/app/views/admin/mail_crons/_sort_headers.html.erb @@ -1,5 +1,5 @@ <%= render_sort_bar(true, delete_admin_mail_crons_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['subject', 'subject','span2', :subject] , + ['subject', 'mail_subject','span2', :mail_subject] , ['mail_to', 'mail_to','span2', :mail_to] , ['mail_from_app', 'mail_from_app','span2', :mail_from_app] , - ['sentdate', 'sentdate','span2', :sentdate] ).html_safe %> \ No newline at end of file + ['sentdate', 'mail_sentdate','span2', :mail_sentdate] ).html_safe %> \ No newline at end of file diff --git a/app/views/admin/mail_crons/index.html.erb b/app/views/admin/mail_crons/index.html.erb index 3057dce6e..04bd455d5 100644 --- a/app/views/admin/mail_crons/index.html.erb +++ b/app/views/admin/mail_crons/index.html.erb @@ -1,4 +1,3 @@ - <% content_for :side_bar do %> <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %> <% end %> @@ -15,14 +14,14 @@ - <%= render :partial => "mail_cron",:collection=> @mail_logs%> + <%= render :partial => "mail_cron",:collection=> @mail_crons%> +
- \ No newline at end of file diff --git a/app/views/admin/mail_crons/index.js.erb b/app/views/admin/mail_crons/index.js.erb index 8b187b189..7a90902d2 100644 --- a/app/views/admin/mail_crons/index.js.erb +++ b/app/views/admin/mail_crons/index.js.erb @@ -1,3 +1,4 @@ +$("#delete_all").attr("action", "<%= delete_admin_mail_crons_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]) %>"); $("#sort_headers").html("<%= j render 'sort_headers' %>"); $("#tbody_mail_crons").html("<%= j render :partial => 'mail_cron', :collection => @mail_crons %>"); $("#mail_cron_pagination").html("<%= j paginate @mail_crons, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>"); \ No newline at end of file