<% if attachment.preferences && attachment.preferences['Content-Type'] && @ContentTypeIcon(attachment.preferences['Content-Type']): %>
<% if @canPreview(attachment.preferences['Content-Type']): %>
-
 %>/ticket_attachment/<%= @article.ticket_id %>/<%= @article.id %>/<%= attachment.id %>)
+
 %>/ticket_attachment/<%= @article.ticket_id %>/<%= @article.id %>/<%= attachment.id %>?view=preview)
<% else: %>
<%- @Icon( @ContentTypeIcon(attachment.preferences['Content-Type']) ) %>
<% end %>
diff --git a/app/controllers/ticket_articles_controller.rb b/app/controllers/ticket_articles_controller.rb
index 681ffb17b..138a23fdd 100644
--- a/app/controllers/ticket_articles_controller.rb
+++ b/app/controllers/ticket_articles_controller.rb
@@ -255,8 +255,21 @@ class TicketArticlesController < ApplicationController
disposition = sanitized_disposition
+ content = nil
+ if params[:view].present? && file.preferences[:resizable] == true
+ if file.preferences[:content_inline] == true && params[:view] == 'inline'
+ content = file.content_inline
+ elsif file.preferences[:content_preview] == true && params[:view] == 'preview'
+ content = file.content_preview
+ end
+ end
+
+ if content.blank?
+ content = file.content
+ end
+
send_data(
- file.content,
+ content,
filename: file.filename,
type: file.preferences['Content-Type'] || file.preferences['Mime-Type'] || 'application/octet-stream',
disposition: disposition
diff --git a/app/models/store.rb b/app/models/store.rb
index 5a79c1966..4827b2c5a 100644
--- a/app/models/store.rb
+++ b/app/models/store.rb
@@ -34,7 +34,7 @@ returns
=end
def self.add(data)
- data = data.stringify_keys
+ data.deep_stringify_keys!
# lookup store_object.id
store_object = Store::Object.create_if_not_exists(name: data['object'])
@@ -50,9 +50,34 @@ returns
data.delete('data')
data.delete('object')
+ data['preferences'] ||= {}
+ ['Mime-Type', 'Content-Type', 'mime_type', 'content_type'].each do |key|
+ next if data['preferences'][key].blank?
+ next if !data['preferences'][key].match(%r{image/(jpeg|jpg|png)}i)
+
+ data['preferences']['resizable'] = true
+ break
+ end
+
# store meta data
store = Store.create!(data)
+ begin
+ if store.preferences[:resizable] == true
+ if store.content_preview(silence: true)
+ store.preferences[:content_preview] = true
+ end
+ if store.content_inline(silence: true)
+ store.preferences[:content_inline] = true
+ end
+ store.save!
+ end
+ rescue => e
+ logger.error e
+ store.preferences[:resizable] = false
+ store.save!
+ end
+
store
end
@@ -165,6 +190,52 @@ returns
=begin
+get content of file in preview size
+
+ store = Store.find(store_id)
+ content_as_string = store.content_preview
+
+returns
+
+ content_as_string
+
+=end
+
+ def content_preview(options = {})
+ file = Store::File.find_by(id: store_file_id)
+ if !file
+ raise "No such file #{store_file_id}!"
+ end
+ raise 'Unable to generate preview' if options[:silence] != true && preferences[:content_preview] != true
+
+ image_resize(file.content, 200)
+ end
+
+=begin
+
+get content of file in inline size
+
+ store = Store.find(store_id)
+ content_as_string = store.content_inline
+
+returns
+
+ content_as_string
+
+=end
+
+ def content_inline(options = {})
+ file = Store::File.find_by(id: store_file_id)
+ if !file
+ raise "No such file #{store_file_id}!"
+ end
+ raise 'Unable to generate inline' if options[:silence] != true && preferences[:content_inline] != true
+
+ image_resize(file.content, 1800)
+ end
+
+=begin
+
get content of file
store = Store.find(store_id)
@@ -204,4 +275,32 @@ returns
file.provider
end
+
+ private
+
+ def image_resize(content, width)
+ local_sha = Digest::SHA256.hexdigest(content)
+
+ cache_key = "image-resize-#{local_sha}_#{width}"
+ all = nil
+ image = Cache.get(cache_key)
+ return image if image
+
+ temp_file = ::Tempfile.new
+ temp_file.binmode
+ temp_file.write(content)
+ temp_file.close
+ image = Rszr::Image.load(temp_file.path)
+ return if image.width < width
+
+ image.resize!(width, :auto)
+ temp_file_resize = ::Tempfile.new.path
+ image.save(temp_file_resize)
+ image_resized = ::File.binread(temp_file_resize)
+
+ Cache.write(cache_key, image_resized, { expires_in: 6.months })
+
+ image_resized
+ end
+
end
diff --git a/app/models/ticket/article.rb b/app/models/ticket/article.rb
index e5c1c56f7..d4f23bf83 100644
--- a/app/models/ticket/article.rb
+++ b/app/models/ticket/article.rb
@@ -82,7 +82,7 @@ returns
article['attachments'].each do |file|
next if !file[:preferences] || !file[:preferences]['Content-ID'] || (file[:preferences]['Content-ID'] != cid && file[:preferences]['Content-ID'] != "<#{cid}>" )
- replace = "#{tag_start}/api/v1/ticket_attachment/#{article['ticket_id']}/#{article['id']}/#{file[:id]}\"#{tag_end}>"
+ replace = "#{tag_start}/api/v1/ticket_attachment/#{article['ticket_id']}/#{article['id']}/#{file[:id]}?view=inline\"#{tag_end}>"
inline_attachments[file[:id]] = true
break
end
diff --git a/db/migrate/20190131000001_setting_change_ticket_zoom_attachment_preview.rb b/db/migrate/20190131000001_setting_change_ticket_zoom_attachment_preview.rb
new file mode 100644
index 000000000..296db7b3f
--- /dev/null
+++ b/db/migrate/20190131000001_setting_change_ticket_zoom_attachment_preview.rb
@@ -0,0 +1,34 @@
+class SettingChangeTicketZoomAttachmentPreview < ActiveRecord::Migration[5.1]
+ def up
+ # return if it's a new setup
+ return if !Setting.find_by(name: 'system_init_done')
+
+ Setting.create_or_update(
+ title: 'Sidebar Attachments',
+ name: 'ui_ticket_zoom_attachments_preview',
+ area: 'UI::TicketZoom::Preview',
+ description: 'Enables preview of attachments.',
+ options: {
+ form: [
+ {
+ display: '',
+ null: true,
+ name: 'ui_ticket_zoom_attachments_preview',
+ tag: 'boolean',
+ translate: true,
+ options: {
+ true => 'yes',
+ false => 'no',
+ },
+ },
+ ],
+ },
+ state: true,
+ preferences: {
+ prio: 400,
+ permission: ['admin.ui'],
+ },
+ frontend: true
+ )
+ end
+end
diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb
index 778538f0c..0d6ce04e1 100644
--- a/db/seeds/settings.rb
+++ b/db/seeds/settings.rb
@@ -793,7 +793,7 @@ Setting.create_if_not_exists(
},
],
},
- state: false,
+ state: true,
preferences: {
prio: 400,
permission: ['admin.ui'],
diff --git a/public/assets/chat/chat-no-jquery.coffee b/public/assets/chat/chat-no-jquery.coffee
index f43d1285b..7b8fe5cc7 100644
--- a/public/assets/chat/chat-no-jquery.coffee
+++ b/public/assets/chat/chat-no-jquery.coffee
@@ -501,7 +501,7 @@ do(window) ->
stopPropagation: (event) ->
event.stopPropagation()
- onPaste: (e) =>
+ onDrop: (e) =>
e.stopPropagation()
e.preventDefault()
diff --git a/test/data/image/1000x1000.png b/test/data/image/1000x1000.png
new file mode 100644
index 000000000..02756786d
Binary files /dev/null and b/test/data/image/1000x1000.png differ
diff --git a/test/data/image/1x1.png b/test/data/image/1x1.png
new file mode 100644
index 000000000..a3e716292
Binary files /dev/null and b/test/data/image/1x1.png differ
diff --git a/test/unit/store_test.rb b/test/unit/store_test.rb
index 492fd313b..92b8657fc 100644
--- a/test/unit/store_test.rb
+++ b/test/unit/store_test.rb
@@ -151,4 +151,124 @@ class StoreTest < ActiveSupport::TestCase
assert_not(attachments[0])
end
end
+
+ test 'test resizable' do
+
+ # not possible
+ store = Store.add(
+ object: 'SomeObject1',
+ o_id: rand(1_234_567_890),
+ data: File.binread(Rails.root.join('test', 'data', 'upload', 'upload1.txt')),
+ filename: 'test1.pdf',
+ preferences: {
+ content_type: 'text/plain',
+ content_id: 234,
+ },
+ created_by_id: 1,
+ )
+ assert_not(store.preferences.key?(:resizable))
+ assert_not(store.preferences.key?(:content_inline))
+ assert_not(store.preferences.key?(:content_preview))
+ assert_raises(RuntimeError) do
+ store.content_inline
+ end
+ assert_raises(RuntimeError) do
+ store.content_preview
+ end
+
+ # not possible
+ store = Store.add(
+ object: 'SomeObject2',
+ o_id: rand(1_234_567_890),
+ data: File.binread(Rails.root.join('test', 'data', 'upload', 'upload1.txt')),
+ filename: 'test1.pdf',
+ preferences: {
+ content_type: 'image/jpg',
+ content_id: 234,
+ },
+ created_by_id: 1,
+ )
+ assert_equal(store.preferences[:resizable], false)
+ assert_not(store.preferences.key?(:content_inline))
+ assert_not(store.preferences.key?(:content_preview))
+ assert_raises(RuntimeError) do
+ store.content_inline
+ end
+ assert_raises(RuntimeError) do
+ store.content_preview
+ end
+
+ # possible (preview and inline)
+ store = Store.add(
+ object: 'SomeObject3',
+ o_id: rand(1_234_567_890),
+ data: File.binread(Rails.root.join('test', 'data', 'upload', 'upload2.jpg')),
+ filename: 'test1.pdf',
+ preferences: {
+ content_type: 'image/jpg',
+ content_id: 234,
+ },
+ created_by_id: 1,
+ )
+ assert_equal(store.preferences[:resizable], true)
+ assert_equal(store.preferences[:content_inline], true)
+ assert_equal(store.preferences[:content_preview], true)
+
+ temp_file = ::Tempfile.new.path
+ File.binwrite(temp_file, store.content_inline)
+ image = Rszr::Image.load(temp_file)
+ assert_equal(image.width, 1800)
+
+ temp_file = ::Tempfile.new.path
+ File.binwrite(temp_file, store.content_preview)
+ image = Rszr::Image.load(temp_file)
+ assert_equal(image.width, 200)
+
+ # possible (preview only)
+ store = Store.add(
+ object: 'SomeObject4',
+ o_id: rand(1_234_567_890),
+ data: File.binread(Rails.root.join('test', 'data', 'image', '1000x1000.png')),
+ filename: 'test1.png',
+ preferences: {
+ content_type: 'image/png',
+ content_id: 234,
+ },
+ created_by_id: 1,
+ )
+ assert_equal(store.preferences[:resizable], true)
+ assert_nil(store.preferences[:content_inline])
+ assert_equal(store.preferences[:content_preview], true)
+ assert_raises(RuntimeError) do
+ store.content_inline
+ end
+
+ temp_file = ::Tempfile.new.path
+ File.binwrite(temp_file, store.content_preview)
+ image = Rszr::Image.load(temp_file)
+ assert_equal(image.width, 200)
+
+ # possible (now preview or inline needed)
+ store = Store.add(
+ object: 'SomeObject5',
+ o_id: rand(1_234_567_890),
+ data: File.binread(Rails.root.join('test', 'data', 'image', '1x1.png')),
+ filename: 'test1.png',
+ preferences: {
+ content_type: 'image/png',
+ content_id: 234,
+ },
+ created_by_id: 1,
+ )
+ assert_equal(store.preferences[:resizable], true)
+ assert_nil(store.preferences[:content_inline])
+ assert_nil(store.preferences[:content_preview])
+ assert_raises(RuntimeError) do
+ store.content_inline
+ end
+ assert_raises(RuntimeError) do
+ store.content_preview
+ end
+
+ end
end