[Logilogi-svn] SF.net SVN: logilogi:[1763] trunk

Revision: 1763
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1763&view=rev
Author:   wybow
Date:     2010-08-14 08:04:46 +0000 (Sat, 14 Aug 2010)

Log Message:
-----------
Fixed some bugs in the Notifier

Modified Paths:
--------------
    trunk/app/models/log_log_subscription.rb
    trunk/app/models/notifier.rb
    trunk/app/views/notifier/admin_log.erb
    trunk/config/config.rb.tmpl

Modified: trunk/app/models/log_log_subscription.rb
===================================================================
--- trunk/app/models/log_log_subscription.rb	2010-08-12 20:40:22 UTC (rev 1762)
+++ trunk/app/models/log_log_subscription.rb	2010-08-14 08:04:46 UTC (rev 1763)
@@ -20,7 +20,7 @@
 
   def self.send_out_alerts(period)
     sent_to = []
-    LogLogSubscription.find_each_by_period(period) do |lls|
+    LogLogSubscription.find_each(:conditions => ['period = "?"', period]) do |lls|
       url = URI.parse(GlobalConfig.log_log_site + 
           "/channels/" + lls.channel + "/periods/" + period + ".txt")
       begin
@@ -40,7 +40,7 @@
     if sent_to.empty?
       sent_to = ['Nobody'] 
     end
-    if lls.channel == "logis"
+    if period == "weekly"
       l_count = Logi.count(:conditions => 'created_at > "' + 1.week.ago.to_s(:db) + '"')
       Notifier.deliver_admin_log(period, sent_to.size,
           "Sent #{period} to: " + sent_to.join(', ') + "\n" +

Modified: trunk/app/models/notifier.rb
===================================================================
--- trunk/app/models/notifier.rb	2010-08-12 20:40:22 UTC (rev 1762)
+++ trunk/app/models/notifier.rb	2010-08-14 08:04:46 UTC (rev 1763)
@@ -37,7 +37,7 @@
   end
 
   def admin_log(period, s_count, periodical)
-    subject       t("#{s_count} mailings, #{period} admin update for #{GlobalConfig.site_host}")
+    subject       "#{s_count} mailings, #{period} admin update for #{GlobalConfig.site_host}"
     from          t('m.notifier.notifier', :email => GlobalConfig.noreply_email)
     recipients    User.admin.email
     sent_on       Time.now

Modified: trunk/app/views/notifier/admin_log.erb
===================================================================
--- trunk/app/views/notifier/admin_log.erb	2010-08-12 20:40:22 UTC (rev 1762)
+++ trunk/app/views/notifier/admin_log.erb	2010-08-14 08:04:46 UTC (rev 1763)
@@ -1,8 +1,3 @@
 <%= t 'v.notifier.dear', :name => User.admin.name %>
 
-<%= t 'v.notifier.hereby_personalized', :period => @period,
-    :domain => GlobalConfig.site_host %>
-
-<%= t 'v.notifier.only_happened' %>
-
 <%= @periodical %>

Modified: trunk/config/config.rb.tmpl
===================================================================
--- trunk/config/config.rb.tmpl	2010-08-12 20:40:22 UTC (rev 1762)
+++ trunk/config/config.rb.tmpl	2010-08-14 08:04:46 UTC (rev 1763)
@@ -114,7 +114,7 @@
     # The following setting is resolved from this one:
     # :daily_fraction 
     #
-    :half_life => 7,
+    :half_life => 28,
 
     # The age in days at which memberships that have no power from
     # posts anymore are dropped.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.