diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb index 7a96c05..6065b96 100644 --- a/app/controllers/emails_controller.rb +++ b/app/controllers/emails_controller.rb @@ -1,7 +1,18 @@ class EmailsController < ApplicationController - load_and_authorize_resource +before_filter :authorize def index end + def daily_reminder + @mail =NewsMailer.daily_reminder(current_user.id) + if params[:send] + @mail.deliver + end + render layout: false +end +protected + def authorize + authorize! :emails,User + end end diff --git a/app/models/ability.rb b/app/models/ability.rb index d59a3bf..4a43e08 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -228,7 +228,7 @@ end end if user.has_role?("fetadmin") - + can :emails,User end end diff --git a/app/views/emails/daily_reminder.html.erb b/app/views/emails/daily_reminder.html.erb new file mode 100644 index 0000000..ac3bb6b --- /dev/null +++ b/app/views/emails/daily_reminder.html.erb @@ -0,0 +1,3 @@ +<%=link_to "reminder", daily_reminder_emails_path(params: {send: true}) %> +
Subject: <%= @mail.subject %>
+<%= raw(@mail.body) %> diff --git a/app/views/emails/index.html.erb b/app/views/emails/index.html.erb new file mode 100644 index 0000000..80b1dea --- /dev/null +++ b/app/views/emails/index.html.erb @@ -0,0 +1 @@ +<%=link_to "reminder", daily_reminder_emails_path() %> diff --git a/app/views/news_mailer/daily_reminder.html.erb b/app/views/news_mailer/daily_reminder.html.erb index b8a3a5a..468e1e9 100644 --- a/app/views/news_mailer/daily_reminder.html.erb +++ b/app/views/news_mailer/daily_reminder.html.erb @@ -1,12 +1,13 @@ - <%= stylesheet_link_tag "http://"+ActionMailer::Base.default_url_options[:host].to_s + "/assets/themes/blue2/application.css", :media=>"all" %> +<%= stylesheet_link_tag "http://"+ActionMailer::Base.default_url_options[:host].to_s + "/assets/themes/blue2/application.css", :media=>"all" %> <% @calentries.each do |ce| %> <% if can?(:show , ce.object) %>
- <%= render partial: "calentries/mail", object: ce %> +

<%= render partial: "calentries/mail", object: ce %> +

<%= render partial: "neuigkeiten/mail", object: ce.object if ce.object.kind_of?(Neuigkeit)%> <% end %> -
-<% end %> +<% end %> +
diff --git a/config/routes.rb b/config/routes.rb index 91b844a..6dc5c56 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,7 +28,9 @@ resources :home, :only=>[:index] do end resources :emails, :only=>[:index] do - + collection do + get :daily_reminder + end end get ':locale', constraints: {locale: /en|de/}, action: :language,controller: :home, as: "language" scope '(:locale)/admin' do