diff --git a/mailing_lists/app/controllers/mailing_lists_controller.rb b/mailing_lists/app/controllers/mailing_lists_controller.rb index 53d441124..e02e46fe2 100644 --- a/mailing_lists/app/controllers/mailing_lists_controller.rb +++ b/mailing_lists/app/controllers/mailing_lists_controller.rb @@ -35,6 +35,7 @@ class MailingListsController < ApplicationController @date_from = Date.civil(@year, @month, 1) @date_to = (@date_from >> 1)-1 + @message_count = @mailing_list.messages.count(:conditions => ["sent_on>=? and sent_on<=?", @date_from, @date_to]) @messages = @mailing_list.messages.find(:all, :conditions => ["parent_id is null and sent_on>=? and sent_on<=?", @date_from, @date_to]) render :layout => false if request.xhr? end diff --git a/mailing_lists/app/views/mailing_lists/messages.rhtml b/mailing_lists/app/views/mailing_lists/messages.rhtml index f9cccce6d..89f5e9de8 100644 --- a/mailing_lists/app/views/mailing_lists/messages.rhtml +++ b/mailing_lists/app/views/mailing_lists/messages.rhtml @@ -3,7 +3,10 @@ <% if @messages.empty? %>
<%= l(:label_no_data) %>
<% else %> +<%= lwr(:label_thread, @messages.length) %>, <%= lwr(:label_message, @message_count) %>
+