From ec4af213f4ddc4aba8f03e2907628c7e1c7727dc Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Wed, 29 Dec 2010 00:25:17 +1300 Subject: [PATCH] Re-use index action for spam, too. Added pagination! --- app/controllers/admin/inquiries_controller.rb | 21 ++++++++++----- app/views/admin/inquiries/index.html.erb | 10 ++++--- app/views/admin/inquiries/spam.html.erb | 26 ------------------- config/locales/de.yml | 1 - config/locales/en.yml | 1 - config/locales/fr.yml | 1 - config/locales/it.yml | 1 - config/locales/lolcat.yml | 1 - config/locales/lt.yml | 1 - config/locales/lv.yml | 1 - config/locales/nb.yml | 1 - config/locales/nl.yml | 1 - config/locales/pl.yml | 1 - config/locales/pt-BR.yml | 1 - config/locales/ru.yml | 1 - config/locales/sv.yml | 1 - 16 files changed, 22 insertions(+), 48 deletions(-) delete mode 100644 app/views/admin/inquiries/spam.html.erb diff --git a/app/controllers/admin/inquiries_controller.rb b/app/controllers/admin/inquiries_controller.rb index 115d7bc6..a7e72f10 100644 --- a/app/controllers/admin/inquiries_controller.rb +++ b/app/controllers/admin/inquiries_controller.rb @@ -1,19 +1,20 @@ class Admin::InquiriesController < Admin::BaseController crudify :inquiry, :title_attribute => "name", :order => "created_at DESC" + helper_method :group_by_date + before_filter :find_all_ham, :only => [:ham] + before_filter :find_all_spam, :only => [:spam] before_filter :get_spam_count, :only => [:index, :spam] def index - @inquiries = Inquiry.ham.with_query(params[:search]) if searching? - - @grouped_inquiries = group_by_date(Inquiry.ham) + @inquiries = @inquiries.with_query(params[:search]) if searching? + @inquiries = @inquiries.paginate({:page => params[:page]}) end def spam - @inquiries = Inquiry.spam.with_query(params[:search]) if searching? - - @grouped_inquiries = group_by_date(Inquiry.spam) + self.index + render :action => 'index' end def toggle_spam @@ -25,6 +26,14 @@ def toggle_spam protected + def find_all_ham + @inquiries = Inquiry.ham + end + + def find_all_spam + @inquiries = Inquiry.spam + end + def get_spam_count @spam_count = Inquiry.count(:conditions => {:spam => true}) end diff --git a/app/views/admin/inquiries/index.html.erb b/app/views/admin/inquiries/index.html.erb index 8d989381..e0a0dae0 100644 --- a/app/views/admin/inquiries/index.html.erb +++ b/app/views/admin/inquiries/index.html.erb @@ -3,23 +3,27 @@ <% if searching? %>

<%= t('shared.admin.search.results_for', :query => params[:search]) %>

<% if @inquiries.any? %> + <%= will_paginate @inquiries %> + <%= will_paginate @inquiries %> <% else %>

<%= t('shared.admin.search.no_results') %>

<% end %> <% else %> - <% if @grouped_inquiries.any? -%> - <% @grouped_inquiries.each do |container| %> + <% if @inquiries.any? -%> + <%= will_paginate @inquiries %> + <% group_by_date(@inquiries).each do |container| %>

<%= l((inquiry_group = container.last).first.created_at, :format => :short) %>

<% end %> + <%= will_paginate @inquiries %> <% else -%>

- <%= t('.no_inquiries') %> + <%= t(".no_#{action_name == 'index' ? 'inquiries' : 'spam'}") %>

<% end -%> <% end %> diff --git a/app/views/admin/inquiries/spam.html.erb b/app/views/admin/inquiries/spam.html.erb deleted file mode 100644 index 5e07fa29..00000000 --- a/app/views/admin/inquiries/spam.html.erb +++ /dev/null @@ -1,26 +0,0 @@ -<%= render :partial => "submenu" %> -
- <% if searching? %> -

<%= t('shared.admin.search.results_for', :query => params[:search]) %>

- <% if @inquiries.any? %> - - <% else %> -

<%= t('shared.admin.search.no_results') %>

- <% end %> - <% else %> - <% if @grouped_inquiries.any? -%> - <% @grouped_inquiries.each do |container| %> -

<%= l((inquiry_group = container.last).first.created_at, :format => :short) %>

- - <% end %> - <% else -%> -

- <%= t('.no_spam') %> -

- <% end -%> - <% end %> -
diff --git a/config/locales/de.yml b/config/locales/de.yml index df975139..12fc12bb 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -22,7 +22,6 @@ de: edit_confirmation_email: Bestätigungs-E-Mail bearbeiten index: no_inquiries: Sie haben noch keine Kontaktanfragen erhalten. - spam: no_spam: Juhu! Sie haben keinen Spam. show: details: Details diff --git a/config/locales/en.yml b/config/locales/en.yml index 5db33252..f4310beb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -22,7 +22,6 @@ en: edit_confirmation_email: Edit confirmation email index: no_inquiries: You have not received any inquiries yet. - spam: no_spam: Hooray! You don't have any spam. show: details: Details diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 9da5d85b..830674e1 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -22,7 +22,6 @@ fr: edit_confirmation_email: Modifier l'e-mail de confirmation index: no_inquiries: Vous n'avez reçu aucune requête. - spam: no_spam: Vous n'avez aucun spam. show: details: Détails diff --git a/config/locales/it.yml b/config/locales/it.yml index 75bc8830..be72399c 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -24,7 +24,6 @@ it: edit_confirmation_email: Modifica la mail di conferma index: no_inquiries: Non hai ancora ricevuto alcuna richiesta. - spam: no_spam: Evviva! Non hai alcuno spam show: details: Dettagli diff --git a/config/locales/lolcat.yml b/config/locales/lolcat.yml index 58a3b4f1..794fbfd8 100644 --- a/config/locales/lolcat.yml +++ b/config/locales/lolcat.yml @@ -22,7 +22,6 @@ lolcat: edit_confirmation_email: EDIT CONFIRMASHUN EMAIL index: no_inquiries: U HAS NOT RECEIVD ANY INQUIRIEZ YET. - spam: no_spam: HOORAH! U DOAN HAS ANY SPAM. show: details: DETAILS diff --git a/config/locales/lt.yml b/config/locales/lt.yml index abffb285..b4939d8f 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -22,7 +22,6 @@ lt: edit_confirmation_email: Redaguoti patvirtinimo laišką index: no_inquiries: Kol kas nėra jokių užklausų. - spam: no_spam: Valio! Jūs neturite jokio spamo. show: details: Smulkesnė informacija diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 4cad6116..38c4a7b8 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -22,7 +22,6 @@ lv: edit_confirmation_email: Labot apstiprinājuma epastu index: no_inquiries: Nav saņemts neviens pieprasījums. - spam: no_spam: Urā! Jums nav neviens pieprasījums, kas būtu spams. show: details: Detaļas diff --git a/config/locales/nb.yml b/config/locales/nb.yml index d806629c..09e7255f 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -40,7 +40,6 @@ nb: index: search_results_for: Søkeresultater for %{query} no_inquiries: Du har ikke mottatt noen forespørsler enda. - spam: no_spam: Hurra! Du har ikke noen søppelpost. show: details: Detaljer diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 8b048fc5..e89cfa2f 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -21,7 +21,6 @@ nl: edit_confirmation_email: Bewerk bevestigings email index: no_inquiries: Je hebt nog geen vragen ontvangen. - spam: no_spam: Jeej! Je hebt geen spam. show: details: Details diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 41a21032..0605ea48 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -23,7 +23,6 @@ pl: edit_confirmation_email: Zmień email z potwierdzeniem index: no_inquiries: Nie ma jeszcze żadnych zapytań. - spam: no_spam: Hurra! Nie masz żadnego spamu. show: details: Szczegóły diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 5b50f4ae..1c356fae 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -22,7 +22,6 @@ pt-BR: edit_confirmation_email: Editar email de confirmação index: no_inquiries: "Não exitem mensagens." - spam: no_spam: Não existem mensagens de spam. show: details: Detalhes diff --git a/config/locales/ru.yml b/config/locales/ru.yml index fb92b32f..6c549923 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -22,7 +22,6 @@ ru: edit_confirmation_email: Редактировать письмо-подтверждение index: no_inquiries: "Вы еще не получили ни одного запроса." - spam: no_spam: "Ура, спама нет!" show: details: Подробности diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 0750d9c2..342ce1e4 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -22,7 +22,6 @@ sv: edit_confirmation_email: Redigera bekräftelse index: no_inquiries: Du har inte fått några förfrågningar ännu. - spam: no_spam: Hurra! Du har ingen skräppost. show: details: Detaljer