AutoCommit Die Jun 9 18:03:02 CEST 2015

app/controllers/neuigkeiten_controller.rb

@@ -100,6 +100,12 @@ class NeuigkeitenController < ApplicationController
     @neuigkeit = Neuigkeit.find(params[:id])
     authorize! :publish, @neuigkeit
     render template: "news_mailer/neuigkeit_mail", layout: false
+  end
+  def newsletter_preview
+    authorize! :publish, Neuigkeit
+    @neuigkeiten=Neuigkeit.accessible_by(current_ability).where("cache_order<2")
+    render template: "news_mailer/daily_newsletter", layout: false
+ 
  end
   def edit
     @neuigkeit = Neuigkeit.find(params[:id])

app/mailers/news_mailer.rb

@@ -8,7 +8,6 @@ class NewsMailer < ActionMailer::Base
   def daily_newsletter(user_id)
     user=User.find(user_id)
     ability= Ability.new(user)
-    @neuigkeiten=Neuigkeit.accessible_by(ability).where(:cache_order<2)
+    @neuigkeiten=Neuigkeit.accessible_by(ability).published_scope.where("cache_order<2")
-
   end
 end

app/models/neuigkeit.rb

@@ -132,7 +132,9 @@ class Neuigkeit < ActiveRecord::Base
     self.has_calentries?
   end
   def relevant_calentry
-    self.calentries.min_by{|c| c.days_to_today * 1.3 * ((c.is_past?)? 2:1)}
+    ce = self.calentries.min_by{|c| c.days_to_today * 1.3 * ((c.is_past?)? 2:1)} if self.is_event?
+    ce= self.meeting.calentry if self.has_meeting? 
+    ce
   end
   def update_cache
     if self.has_meeting? && !self.meeting.calentry.nil?

app/views/news_mailer/daily_newsletter.html.erb

@@ -0,0 +1,9 @@
+
+<% @neuigkeiten.each do |n| %>
+<% if n.is_annoncement? || n.is_event? %>
+<%= n.rubrik.icon_name %> |<%= n.relevant_calentry.text %> |
+
+<% end %>
+	<%= render n %>
+	<hr/>
+<% end %>

config/routes.rb

@@ -130,6 +130,10 @@
             get 'publish_to_facebook'
             get 'mail_to_fet'
             get 'mail_preview'
+ 
+          end
+          collection do
+            get 'newsletter_preview'
           end
        end
       end