From acbe704c3b5041a24d811c6e49af650210e04831 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 7 Apr 2015 01:34:47 +0200 Subject: [PATCH] Added attachment size check. --- app/models/ticket/search_index.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/models/ticket/search_index.rb b/app/models/ticket/search_index.rb index 0cad2a46a..d78ca0eed 100644 --- a/app/models/ticket/search_index.rb +++ b/app/models/ticket/search_index.rb @@ -78,13 +78,12 @@ returns # lookup attachments article.attachments.each {|attachment| - if !attributes['attachments'] - attributes['attachments'] = [] + if !article_attributes['attachments'] + article_attributes['attachments'] = [] end # check file size - if true -# if attachment.content && attachment.content.size / 1024 / 1024 <= attachment_max_size_in_mb + if attachment.content && attachment.content.size / 1024 <= attachment_max_size_in_mb * 1024 # check ignored files if attachment.filename @@ -92,10 +91,10 @@ returns filename_extention.gsub!(/^.*(\..+?)$/, "\\1") if !attachments_ignore.include?( filename_extention.downcase ) data = { - '_name' => attachment.filename, - 'content' => Base64.encode64( attachment.content ) + '_name' => attachment.filename, + '_content' => Base64.encode64( attachment.content ) } - attributes['attachments'].push data + article_attributes['attachments'].push data end end end