Fixed creation of article.message_id_md5 right after generating message_id.
This commit is contained in:
parent
618a1cb0db
commit
4bd1f8ebf1
2 changed files with 10 additions and 7 deletions
|
@ -30,6 +30,9 @@ class Observer::Ticket::Article::FillupFromEmail < ActiveRecord::Observer
|
||||||
fqdn = Setting.get('fqdn')
|
fqdn = Setting.get('fqdn')
|
||||||
record.message_id = '<' + DateTime.current.to_s(:number) + '.' + record.ticket_id.to_s + '.' + rand(999_999).to_s() + '@' + fqdn + '>'
|
record.message_id = '<' + DateTime.current.to_s(:number) + '.' + record.ticket_id.to_s + '.' + rand(999_999).to_s() + '@' + fqdn + '>'
|
||||||
|
|
||||||
|
# generate message_id_md5
|
||||||
|
record.check_message_id_md5
|
||||||
|
|
||||||
# set sender
|
# set sender
|
||||||
email_address = ticket.group.email_address
|
email_address = ticket.group.email_address
|
||||||
if !email_address
|
if !email_address
|
||||||
|
|
|
@ -30,6 +30,13 @@ class Ticket::Article < ApplicationModel
|
||||||
preferences: true,
|
preferences: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# fillup md5 of message id to search easier on very long message ids
|
||||||
|
def check_message_id_md5
|
||||||
|
return if !message_id
|
||||||
|
return if message_id_md5
|
||||||
|
self.message_id_md5 = Digest::MD5.hexdigest(message_id.to_s)
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# strip not wanted chars
|
# strip not wanted chars
|
||||||
|
@ -38,13 +45,6 @@ class Ticket::Article < ApplicationModel
|
||||||
subject.gsub!(/\s|\t|\r/, ' ')
|
subject.gsub!(/\s|\t|\r/, ' ')
|
||||||
end
|
end
|
||||||
|
|
||||||
# fillup md5 of message id to search easier on very long message ids
|
|
||||||
def check_message_id_md5
|
|
||||||
return if !message_id
|
|
||||||
return if message_id_md5
|
|
||||||
self.message_id_md5 = Digest::MD5.hexdigest(message_id.to_s)
|
|
||||||
end
|
|
||||||
|
|
||||||
class Flag < ApplicationModel
|
class Flag < ApplicationModel
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue