andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Son Aug 30 10:03:05 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-30 10:03:05 +02:00
parent bffb978fc7
commit e098c0cd36
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/emails_controller.rb
View File

@@ -5,14 +5,18 @@ before_filter :authorize
end end
def daily_reminder def daily_reminder
ActionMailer::Base.default_url_options[:host] = request.host_with_port
@mail =NewsMailer.daily_reminder(current_user.id) @mail =NewsMailer.daily_reminder(current_user.id)
if params[:send] if params[:send]
@mail.deliver usr=User.where(:flag_getemails => true)
usr.each do |u|
NewsMailer.daily_reminder(current_user.id).deliver
end
end end
render layout: false render layout: false
end end
protected protected
def authorize def authorize
authorize! :emails,User authorize! :emails, User
end end
end end

7
app/controllers/neuigkeiten_controller.rb
View File

@@ -119,12 +119,15 @@ end
end end
end end
def mail_preview def mail_preview
ActionMailer::Base.default_url_options[:host] = request.host_with_port
@neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit = Neuigkeit.find(params[:id])
@user=current_user @user=current_user
@ability=Ability.new(@user) @ability=Ability.new(@user)
@mail = NewsMailer.neuigkeit_mail("all@fet.at", params[:id])
authorize! :publish, @neuigkeit authorize! :publish, @neuigkeit
render template: "news_mailer/neuigkeit_mail", layout: false render layout: false
end end
def newsletter_preview def newsletter_preview
authorize! :publish, Neuigkeit authorize! :publish, Neuigkeit

5
app/views/neuigkeiten/mail_preview.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<%= link_to "send", mail_preview_rubrik_neuigkeit_path(@neuigkeit) %>
<%= raw(@mail.subject) %>
<hr />
<%= raw(@mail.body) %>

2
app/views/themes/blue2/neuigkeiten/_menu.html.erb
View File

@@ -27,7 +27,7 @@
<%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published? <%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published?
%> %>
<%= li_tag(link_to(fa_icon("envelope-o") + " send mail", mail_to_fet_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published? <%= li_tag(link_to(fa_icon("envelope-o") + " send mail", mail_preview_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published?
%> %>
</ul> </ul>
</div> </div>