Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Committing last changes of Célestin Matte and deleting strange files.
  • Loading branch information
michael-jo-kling committed Nov 8, 2012
1 parent ac83cd5 commit 2844719
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
19 changes: 12 additions & 7 deletions app/models/reminder_mailer.rb
Expand Up @@ -3,7 +3,7 @@ class ReminderMailer < ActionMailer::Base
helper :queries
helper :reminders
include Redmine::I18n

def self.default_url_options
h = Setting.host_name
h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
Expand All @@ -15,10 +15,15 @@ def issues_reminder(user, queries_data)
default_url_options[:host] = Setting.host_name
default_url_options[:protocol] = "http"
set_language_if_valid user.language
recipients user.mail
from Setting.mail_from
content_type "text/html"
subject Setting.plugin_redmine_issue_reminder['issue_reminder_mail_subject'] || "Issue Reminder"
body :queries_data => queries_data
end
# recipients user.mail
# from Setting.mail_from
mail(:to => user.mail,
:from => Setting.mail_from,
:content_type => "text/html",
:subject => Setting.plugin_redmine_issue_reminder['issue_reminder_mail_subject'] || "Issue Reminder",
:template_path => 'plugins/redmine_issue_reminder\
/app/views/reminder_mailer',
:template_name => 'issues_reminder',
:body => queries_data)
end
end
2 changes: 1 addition & 1 deletion app/views/reminders/_form.html.erb
@@ -1,4 +1,4 @@
<%= form_for(:reminder, :url => {:action => (reminder.new_record? ? :create : :update), :id => reminder}, :remote => true, :method => :put ) do |f| %>
<%= form_for(:reminder, :url => {:action => (reminder.new_record? ? :create : :update), :id => reminder}, :remote => true, :method => (reminder.new_record? ? :post : :put) ) do |f| %>
<%= f.hidden_field :project_id, { :value => project.id } %>
<p>
<%= f.label l(:query) %>
Expand Down
4 changes: 0 additions & 4 deletions config/routes.rb~

This file was deleted.

7 changes: 3 additions & 4 deletions init.rb
Expand Up @@ -2,7 +2,6 @@
require 'active_support/core_ext'

# This plugin should be reloaded in development mode.
#if RAILS_ENV == 'development'
if Rails.env == 'development'
ActiveSupport::Dependencies.autoload_once_paths.reject!{|x| x =~ /^#{Regexp.escape(File.dirname(__FILE__))}/}
end
Expand Down Expand Up @@ -30,15 +29,15 @@
permission :view_issue_reminder, :reminders => :index
end

# if_proc = Proc.new{|project| project.enabled_module_names.include?('issue_reminder')}
if_proc = Proc.new{|project| project.enabled_module_names.include?('issue_reminder')}
menu :project_menu,
:issue_reminder,
{ :controller => 'reminders', :action => 'index' },
:caption => :issues_reminder,
:last => true,
#:after => :activity,
:param => :project_id
# :if => if_proc
:param => :project_id,
:if => if_proc

# menu :application_menu, :issue_reminder, { :controller => 'reminders', :action => 'index' }, :caption => :usses_reminder

Expand Down
Empty file removed lib/#$#
Empty file.
6 changes: 3 additions & 3 deletions lib/tasks/reminder.rake
Expand Up @@ -17,9 +17,9 @@ namespace :reminder do
end
end
end

mail_data.each do |user, queries_data|
ReminderMailer.deliver_issues_reminder(user, queries_data)
mail_data.each do |user, queries_data|
ReminderMailer.issues_reminder(user, queries_data).deliver
end
end
end

0 comments on commit 2844719

Please sign in to comment.