mirror of
https://github.com/meineerde/redmine.git
synced 2025-10-17 17:01:01 +00:00
code cleanup: rubocop: fix Lint/IneffectiveAccessModifier in app/models/mailer.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@18778 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
7738078717
commit
b0e28db7c7
@ -393,7 +393,6 @@ Lint/IneffectiveAccessModifier:
|
||||
- 'app/models/attachment.rb'
|
||||
- 'app/models/issue.rb'
|
||||
- 'app/models/mail_handler.rb'
|
||||
- 'app/models/mailer.rb'
|
||||
- 'app/models/user.rb'
|
||||
|
||||
Lint/InterpolationCheck:
|
||||
|
||||
@ -742,28 +742,31 @@ class Mailer < ActionMailer::Base
|
||||
h.each { |k,v| headers["X-Redmine-#{k}"] = v.to_s }
|
||||
end
|
||||
|
||||
def self.token_for(object, user)
|
||||
timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
|
||||
hash = [
|
||||
"redmine",
|
||||
"#{object.class.name.demodulize.underscore}-#{object.id}",
|
||||
timestamp.utc.strftime("%Y%m%d%H%M%S")
|
||||
]
|
||||
hash << user.id if user
|
||||
host = Setting.mail_from.to_s.strip.gsub(%r{^.*@|>}, '')
|
||||
host = "#{::Socket.gethostname}.redmine" if host.empty?
|
||||
"#{hash.join('.')}@#{host}"
|
||||
end
|
||||
# Singleton class method is public
|
||||
class << self
|
||||
def token_for(object, user)
|
||||
timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
|
||||
hash = [
|
||||
"redmine",
|
||||
"#{object.class.name.demodulize.underscore}-#{object.id}",
|
||||
timestamp.utc.strftime("%Y%m%d%H%M%S")
|
||||
]
|
||||
hash << user.id if user
|
||||
host = Setting.mail_from.to_s.strip.gsub(%r{^.*@|>}, '')
|
||||
host = "#{::Socket.gethostname}.redmine" if host.empty?
|
||||
"#{hash.join('.')}@#{host}"
|
||||
end
|
||||
|
||||
# Returns a Message-Id for the given object
|
||||
def self.message_id_for(object, user)
|
||||
token_for(object, user)
|
||||
end
|
||||
# Returns a Message-Id for the given object
|
||||
def message_id_for(object, user)
|
||||
token_for(object, user)
|
||||
end
|
||||
|
||||
# Returns a uniq token for a given object referenced by all notifications
|
||||
# related to this object
|
||||
def self.references_for(object, user)
|
||||
token_for(object, user)
|
||||
# Returns a uniq token for a given object referenced by all notifications
|
||||
# related to this object
|
||||
def references_for(object, user)
|
||||
token_for(object, user)
|
||||
end
|
||||
end
|
||||
|
||||
def message_id(object)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user